Fix for head-to-head upgrade.