Backed out changeset 236f9b1f3569 (bug 868914) for bustage. a=backout