Revert "REVERT THE HARD WAY"

This reverts commit a7e13cdfc6ee214fe0104e01b1c8b779f81e18e8.