> For now, here is a context diff version of the patch as-is.