This reverts commit 6ff6d32e, because 68a235d0 was reverted in e406cca5.
mentioned in commit 94d4ca90