Oops, should have moved this into data_setup as well.