This reverts commit e8111501.
It was merged prematurely, before everyone asked for comments had a chance to review it.