Revert "Track M7 local now"

This reverts commit cc33f5477ff678003bc7feb928588a139007a998.

Change-Id: I45246d4f9c0769a6aa7e5c9a45f78e01ca4781d4