Backed out changeset da55e2e7ef28 (bug 936056) for bustage. DONTBUILD