Revert "[M4/U0] Fix old merge"

This reverts commit 19a04612b76a96ade253bc5f1c820c06f1b5be44.