This reverts commit e56b3206. Requested by TSC on 17/06/2025 Change-Id: I2e2e47ab94d832c35ec80294291a31f4c14ffa57