BISERVER-7589: Cleanup of Data Access
Revert "BISERVER-7589: Cleanup of Data Access"

This reverts commit a74b2c1eed9bbe5ef9549cda75ab00b96160c4af.