revert some bad ideas