Revert revert via revert and get this revert reverted

This reverts commit 89485d782398acad24983629c6c1231ffb1a83a2.