This reverts commit d1ccf0e8. Aproved by TSC on 22.06.23 Change-Id: If913a5a7d39731455f287fdc01bf2bbef53f744f