Backed out changeset 3762c3e540cd (bug 981894) for bustage.