This reverts commit 93e48e8cf1.
The existing code in master already worked correctly for the original
problem, and this change just introduced a new problem.
Bug: 18576264
This reverts commit 93e48e8cf1.
The existing code in master already worked correctly for the original
problem, and this change just introduced a new problem.
Bug: 18576264