Backed out changeset 9689cb126c84 (bug 866893) for bustage. a=backout