This reverts commit 407a433b. Requested by TSC on 28.04.2025 Change-Id: I1c886fabebb771a3b92d935b9244252e9efe018e