So that it can be reused outside of group manager without having to
duplicate the backward-compatibility order.
Also, simplify code.