This reverts commit c23608b8. It looks like this depends on #79345, which isn't going to land today, so revert for now.