This reverts commit cb6a5916. Test: m test-art-host Change-Id: I8029dcc93e7fa614d8d50030362d3133caabfe54