#2237: fix `make data`

fixes regressions from #2231, closes #2237