Revert "Fixed relationship keys"

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