This reverts commit 0ac5d4a7171833d33b35c09a3f5f3ca3ee5cd4d1. This is a revert of a revert; i.e. a reapplication! Fixes for breakage that comes in with this patch is in a follow-on.
This reverts commit 0ac5d4a7171833d33b35c09a3f5f3ca3ee5cd4d1. This is a revert of a revert; i.e. a reapplication! Fixes for breakage that comes in with this patch is in a follow-on.