Revert "GH-88", as it breaks some people (GH-109)

To be revisited at a later date.

This reverts commit 1ca64ea4d250f70f1f8f929373ffb77c4a086bc0.
This reverts commit 445f9f558bba8df996dbb1cda651d00caf908218.
This reverts commit 6fd9b210a725ec3c59c91650e731777541a8389e.