Revert "Do not create unnecessary relations"

This reverts commit 54a9d30c74c5015ea1236b14e18cceeb7c8c3cf5.