Revert "Partial fix for ticket #448"

The solution is not as simple as it looks, as interface expressions are not always declared relations.