This reverts commit 4497c8ce5e, because the tests were correctly reporting a bug that I introduced.
4497c8ce5e