Revert "Issue #2220575 by ezra-g: Avoid Entity's load() method when saving group reference values."

This reverts commit 7670b6608800808903c7b42b8beb58c58dc2c294.