#JC-1275 datasource revert