Back out changeset c3d4784309df (bug 947488) for suspected orange. r=bustage