Revert Step 1
Merge branch 'master' of github.com:/frenetic-lang/frenetic