Undo part of patch by Willys

A regression in tests was introduced by commit
12163092ab793c6d0a1b2883f5e1858b97991e22, intended to
fix issue #49.

Willys' code actually seems to make sense, but I chose
to undo it because
 - It appears to be extraneous to the issue #49
 - It does not fix the tests or remove the now-unused constant

Someone should re-fix it properly. But for now I prefer tests
continue to pass.
Merge pull request #54 from zaitcev/master

Undo part of patch by Willys