Backed out changeset 6d09b5e0b7e9 (bug 937132) for bustage. a=backout