[imx]: revert non-core patches
fixup buffers