Backed out changeset 61e57c281b9a (bug 844561) CLOSED TREE