Bug 15208: Followup to reorder words