Revert "Miscellaneous changes by @sa967st."

This reverts commit 77b3a132fd3e184a47cf5290528141ba7a10dff8.