MDL-52210 upgrade: dan *REALLY* sucks at integrating