Revert "Spoofax/724"
Wrong branch.

This reverts commit 8e58950648b68a4d73a81436ad16977b2eaa71a8.