We could fix this patch series up to a clean ordering without "regressions", but I'd rather keep things this way if possible so that we can retain the history of how we got here (which I find is useful later on when we're trying to figure out what sort of insanity led to the state of things long after bringup).