This reverts commit 53b68e676faf208b4a8f817e9bd4ddd522cc6006. Our internal tests are showing breakage with this patch.