Fails armv8 checker tests. This reverts commit a79f0b5d. Change-Id: I8913743f241febbbb24c0662af76397e87e59cd1