Reverting part of #67864 to be able to compile agi/eagi-test that relies on this...