revert some unneeded revertions