Repaired some of the damage caused by rebasing.