Revert "assorted tweaks"

This reverts commit 086dbe2f542db6059526ffba1fdb1090f72d823d.