This reverts commit 78c90158. The comments in the tests indicate that the tests are a little funny anyway, so they clearly weren't enough justification for the change introduced here.
