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

This reverts commit bf78bc70b93fb5347ccb4f2dcb933946ffaed7b8.