Revert "Removing old workaround"

This reverts commit 714d071f76c219231ab4aa0f969a6bea46a6ab56.

Reason for revert: Perhaps caused b/196876329

Change-Id: I0763c44d54134034885471ce74324a8c6c6c296e
Test: presubmit
Bug: 196876329
1 file changed