Revert "This is NOT going to work..."

This reverts commit 2b6f452aeab7058eaf43f01bd4f4b746285fe686.