Backed out changeset 1a35ec54b068 (bug 965970) for bustage.