Set conflict with the forwardported version