This reverts commit b90dc267. Requested by TSC on 13.12.2024 Change-Id: Ifa4ba6c395bfebff562642c18dcb6661ac748896