Revert "[BACKLOG-872] Restructure Data Access to allow for deterministic...

Reverts pentaho/pentaho-platform#2164