This reverts commit a43eac2d. This patch break the i.MX8, revert it firstly. (cherry picked from commit a1bfd5b6)