Revert previous changes; will break legacy projects.
Merge branch 'master' of github.com:metaborg/spoofax