Adds reorder capability.
Cleanup for CMSMS 1.11.x