Backed out changeset 63dfdb7a83c6 (bug 868932) for bustage. a=backout