This reverts commit 8cc049c2. The bug that necessitated that workaround was fixed. Bug: 26441710 Change-Id: Idf238e497052cb983fd56f50a36f0f7998240fa8