Merge "Revert "Remove IDataSource dependency from DataSource.""