Removing old workaround

Bug: 165029151
Test: presubmit
Flag: N/A
Change-Id: Id54344f0b0423caa4c23eb574f0764648f49e41a
1 file changed