Follow-up to fbdab8a