Reviewed-by: alanb, sherman, ahgross, jeff