[BACKLOG-872] Revert: Restructure Data Access to allow for deterministic build