This reverts commit 94d4ca90. I reverted 68a235d0 again in 916be8fd. (cherry picked from commit 93c73d48)