Fix regression in merge that broke #1654