This reverts commit 41b73ae8.

This patch was pushed extremely quickly, without giving developers the
time to object.