This reverts commit 88accd9aaa20c6a30661c48cc2ca6dbbdf991ec0. This change can be dropped in favor of just #102017.