Revert "Back to the drawing board"

This reverts commit 06d68676bdc26f8ab34fb5d7d85c7424fec99907.