Backed out changeset f201b7e443ea (bug 1090385) for bustage.