CS-5244: Fixes ordering, set to default ordering in legacy classes