Revert #3912 and #3825. This reverts commit 35d3b710. This reverts commit 386a7f35.
mentioned in commit b74f1dd9
mentioned in commit 22e9d022