Revert "Pushing in final scheme"

This reverts commit 1b3ca6a965efb353f3d43c3f796d0e069ff213a4.