This reverts commit 6a053505 and all
commits that attempt to fix its regressions.

Shaving off a few lines of code is not worth the effort of fixing all
the regressions caused by shaving a few lines of code.