Repaired the damage caused by my rebasing.