Revert "better DataSource"

This reverts commit e9216c169540b1de5317928bf86a583162acd1cf.