Things fell over when downstream added a patch we had already merged upstream. Closes: #1530 Approved by: jlebon