Reverting some unwanted changes