This reverts commit 51db2c21. Still breaks for arm32. :( Change-Id: I5fe6fc0cc410cc1c5b6bd68028ce9bf835cb94d5