Revert back some unwanted changes