We found issues with this patch in additional testing. Backing out while we work on a fix. This reverts commit 71ed4b6c.