Revert and then refactor for
Merge branch 'master' of https://github.com/ghodgins/TastierCompiler