Backed out changeset 84a3ca9be2eb (bug 940040) for linux bustage