Backed out changeset a52b2b37e42a (bug 1081409) for Linux build bustage.
CLOSED TREE