reverting core class reorder