Backed out changeset 91e1d8abb51e (bug 793465) for bustage.