Fix inadvertant inclusion of changes from another branch