This reverts commit 61dfd43e.
mentioned in commit b7f8d6d9
mentioned in commit 98ca5625
mentioned in commit 59ecaafa