This reverts commits 53c9a31d through 1b34b968.
They were accidentally committed to the master branch without going through a proper review.