Revert "assorted tweaks"

This reverts commit f880d40f92e645374f3d7f9f00e4ee72e5c67d9b.