Follow up fix 2 for bug 623435. (r=brendan)