revert some of the changes