US5976 revert reference config change
Merge branch 'us5975' of github.com:inbloomdev/datastore into us5975