Backed out changeset 6e9d3acbb028 (bug 959973) for bustage.