Revert "Spoofax/856"

This reverts commit b8986cc1b128b451b93bf8ba13a76ffe4761afcd.