This reverts commit d26c17d7. Requested by TSC on 01.07.2025 Change-Id: I46358e3923e6611536a03638e82bd22d52fb3ed2