Follow-up to r52888: