Partially rolling back some of the recent changes