Backed out changeset dff900f56c49 (bug 987310) for orange in bc2 linux tests