Revert "Various small tweaks from morfic and franco"

This reverts commit 55d0a6f06df8c3238e786c8fe27c1ebe16fb3750.