Reverted some unwanted changes