Follow-up to r52226.