Backed out changeset 48ba597444e8 (bug 934091) for linux build bustage on a CLOSED TREE