Fixing bug 418068 for real. The previous patch was broken. Patch by Jesse Clark <jjclark1982@gmail.com> r=mkanat