Change registration order again so T2 survives 1.6->1.7 upgrade.