This reverts commit ba12d61b.
mentioned in commit eb17dd26
mentioned in commit 4d2934a5
mentioned in commit 3b027fb5