This reverts commit 228c45f13dc92546661b6825b7b32c3808b0d2eb (PR #148937) . Now that #148027 is landed, I think it is safe to "reland" the original PR: #148028
This reverts commit 228c45f13dc92546661b6825b7b32c3808b0d2eb (PR #148937) . Now that #148027 is landed, I think it is safe to "reland" the original PR: #148028