The original PR contained a use-after-delete issue, which has been resolved in #189521. Reland #189295, which is reverted in #189311
The original PR contained a use-after-delete issue, which has been resolved in #189521. Reland #189295, which is reverted in #189311