Recovered bug fix lost on merge.