Backed out changeset 32d47282044f (bug 1038411) because of build bustage on CLOSED TREE