Revert "New syntax for relations"

This reverts commit 3b824b0a8757d71778993846989d58de81b56275.