Recovery from strange merge of Don's last pull request