This reverts commit bb65b95c.
mentioned in commit b68aaa72
mentioned in commit 572b4cd9
mentioned in commit 1223e1f5