Revert "Spoofax/724"

This reverts commit 217e3363b43b436c0f7c446269f5e75d40798401.