This caused PR44953. See also the discussion on D74846. This reverts commit cbc9d22e. (cherry picked from commit 7ea9a6e0)