Revert "A great many changes"

This reverts commit 953239075d04350e7d17da1c90f0bd603bc1c831.