Revert part of MHL support