Revert "NXP-10122: WIP" because there is a dedicated branch for NXP-10122

This reverts commit b59a1e3814c3aa842e9da197032f435d657f7e32.