I'll need to do something smarter longer term, but this should tie us
over for now.
Merge branch 'less_data' into 'master'

Less data

Just a stopover measure.

See merge request !18