This reverts commit f7ab8348. Test: make test-ar-host -j64 Change-Id: I688b7c7905c8be575959fa78ad594ac1c782af9a