back out some recent tweaks