Why was this default ordering re-introduced? It was deliberately removed in 8596278e for #2820.