Revert "assorted tweaks"

This reverts commit bd179d0d63c00207d0c283b9df34c87f2d008ac4.