Revert "More mhl fixing"

This reverts commit cfe4fa2f914f261d50051da809d3daa11b38eadd.