Revert "minor twerks"

This reverts commit dd869c784173cb94a0e730f13cccfe034feff9c7.