Remove work-around for a bug that's been fixed

- Bug: 11446702

Change-Id: I6b570066d40607adf05f90b369cbaffffac35e20
1 file changed