Backed out changeset 7276d56ec510 (bug 951043) for build test failures