Follow-up to final comment in #680
Follow-up to final comment in #680