revert some uneeded work