This reverts commit 9583a3f2625818b78c0cf6d473cdedb9f23ad82c. This wasn't NFC as initially thought. Needed for D99707.