backout 720e51754413 (bug 962349) to find an eideticker regression. r=backout