Work around broken M7.

It'll be nice when M8 comes out.