revert some tweaks