This reverts commit d592dbe1. Reason for revert: art buildbots crashing Change-Id: Ida6bb79cb498e708df5c535edc16e4fe9875442c