Merge "Remove workaround for a fixed bug."
am: c4a167426f

Change-Id: I16e8a305b6c1c6dbb898da8b3863b28462db9fcb