Follow-up to b94354b