This reverts commit 2d1517e710. This introduced a regression that was patched incorrectly in 7cef671cb1
2d1517e710
7cef671cb1