This reverts commit de6dd2c4. Requested by TSC on 07.07.2023 Change-Id: Ice6a0c82b37f398ea274568832c561476f477717