DataSourceImpl reverted back to previous version