Backed out changeset 8a5c1027e6e6 (bug 953303) for bustage.