Revert "Fixed relationship keys"

This reverts commit 065da37ec920e6765cf20dd03d66e8a45e8edf85.
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Fixed
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Merge branch '3.0/develop' of github.com:pyrocms/pyrocms into 3.0/develop