Revert "[MTP] fix an ArrayIndexOutOfBoundsException"

This reverts commit 53c4deb0d08c7ce68857a04632fb3cc8e82eded2.