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
93e48e8cf1
f0fc23a1
ee665151
2008cff7
4fec1b48
600ca140