Fix dodgy contributed merge :(