revert some of the default order assignment for now