Merge "Remove obsolete workaround."
am: bf925b0580

Change-Id: Ibb46ab8fcc58161cef047e740860ff6ac9644232