Removing old workaround

Test: presubmit
Bug: 165029151
Change-Id: I5a64c6e381c0bbbf849658648bd5b75a1e660381
1 file changed