this patch is already on trunk.