This reverts commit 988487cf.

Reason for revert: Breaks git_master-art: b/285863158

Change-Id: I9421f905535839a857991f3b90bc3e85a9b74074
Bug: 285863158