Fails on armv8 / speed-profile This reverts commit 636e870d. Change-Id: Ib2a09b3adeba994c6b095672a1e08b32d3871872