Backed out changeset 9878f361d7f7 (bug 1115246) to see if it fixes linux builds on a CLOSED TREE