0.7.6 again, 0.7.22 migration breaks