Backed out changeset 526a056da173 (bug 1092855) for bustage. a=backout