Appears to be causing problems on 2017 devices. This reverts commit c1f00f8c. Change-Id: I6c1717a612bfa3fe63f08160a1db652c284f6ba4