Backed out changeset ef2bf9308ed7 (bug 1056213)