Remove workaround for bug that was fixed a while ago.

Change-Id: I368dd8fea6b33af6908b6fe3b7691104166a707a
2 files changed