Fix bug 916404. r=mccr8