Remove flag put back during merge