Fails 530-checker-loops on arm This reverts commit bf03fcd1. Change-Id: I739aaaccd0509d02a62ef01e797a6d45bfe941df