#2237: fix `make data`

fixes regressions from #2231
Merge pull request #2246 from gittip/2237-fix-make-data

#2237: fix `make data`