Revert "Various small tweaks from morfic and franco"

This reverts commit 1b35ae0de0fc08fadaaa3c72384a7899a1c1d6ea.