This reverts commit a90d44ff.
mentioned in commit 1443decc
mentioned in commit 280aaa89
mentioned in commit 815b141e