This reverts commit 7ff232e958. See discussion at the original commit. CC: #4999, #5001, #5061, #5071.
7ff232e958