Revert "Merge remote-tracking branch 'dulaccc/relationship-url-following'"

This reverts commit d98c896ad3e092db09da87ebb79e195b4ff7ae72, reversing
changes made to 650421590d559d7967758ff5f6e16799036b23fc.
Fix bad merge