Revert "Fix previous commit."

This reverts commit 8b456f07a5ddadf1c11ac8243c655abd448eb445.
Revert "Import MTK compatibility:"

This reverts commit e0087be018dad4151ddf4ef5a1e138911738c66f.