This reverts commit 42faf9d242. This caused #118529. Better figure out a fix first before committing this again.
42faf9d242