Backout 8478f79368ae - caused Bug 1090788. a=backout