This reverts commit 5ea85ff8. Requested by TSC on 17/06/2025 Change-Id: I13beffafa1927bc8371e1cfc4f18547e9ab539ca