Revert "Enable compatibility with all M8 variants"

This reverts commit 58795814fc0999fada6ffe9cd99491f398d1c45a.