Remove automerge propertrties added in r381527