Followup to r53844, move to correct section and use common style