Rolled some changes back