Reenable old data source & fix loading.