Revert "Add flag to prevent M8 using this"

This reverts commit 8ab08e667b12ec747c7f0865ade292fd5e2f5266.

Change-Id: I7d380f279b7052672826fafb5cfb0a572a089812