Fix missing changes from bad merge