r21064: The core of this patch is