Backed out changeset 77e83106be39 (bug 941002)