Backed out changeset 9cbb8e7e65df (bug 846612) for bustage. a=backout