This reverts commit 369cc819. Requested by TSC on 23.07.2025 Change-Id: Id77c6084add8ba35c54687df1b3b6f3f5f1a4754