revert some bad changes