Backed out changeset a5c71a784e33 (bug 950647) for Linux Build Bustage on a CLOSED TREE