New plan-- this patch is entirely pointless! I have reverted it in a local build and had no regressions.
As such, simply do not review or consider this patch. I am not not planning on re-sending the patchset even though it adjusts the patch numbers because it is such an arduous process given that gmail no longer supports git send-email.
