This reverts commit 40a3766b37.
40a3766b37
Note: I will now expect new PRs to add tests for the functionality they add or change. (Including my own, mostly...) Fixes #657