Still failing on armv8. This reverts commit 39d764d0. Change-Id: I93a48fe2c4926d8e560a36c92f11bd91cde4a238