Backed out changeset af8f2d2baab8 (bug 931891)