This reverts commit c60f8aef5b92d58cc458fd09122cd9296e7d164e.

I've had to revert this because it breaks an existing test, because
it changes behavior. I will revisit this issue in the future.