Revert "Merge remote-tracking branch 'jamesward/jamesward-cleanup'"

This reverts commit 629a564d5c8e8b921ddc825f2238e19eb8a948dd, reversing
changes made to ad2653d3678a5f3ef2d7b61ab91663d7a9a2adb0.