Fixed botched r5531 patch