This reverts commit f1607889.
mentioned in commit 917d94dd
mentioned in commit f18850af
mentioned in commit 5fd9424e
mentioned in commit 2d720f13