Revert "Scrap this"

This reverts commit 85e925fe22a061e2eae0fb2fa08d44ba419e61e2.