Revert "Work around b/70221552"

This reverts commit 159799d7c971777231d17c0aabd60d36044ab331.

Reason for revert: b/70221552 is fixed

Change-Id: Iaae0df6736a3141847376b9ab0115f1c7a31fdb1
2 files changed