Fix bug 1064636, r=rrelyea, a=lmandel