Backout of 53244356f497 because of bug 1088274. r=me