[imx]: revert non-core patches

This revert the non-core imx patches.

No rush to merge this one before we are actually ready to submit the upstream PR.