Revert oa_panopoly_users and update for new Features Override