Re apply patch lost in merge