This reverts commit 12546c85.

Apparently I stirred a hornet's nest with this. And I have already
wasted enough time arguing...