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
2122e14c
d9d48cc
f60f29d0
c9149984
e832393
9b287368
6bdbae07
7557ec1
c7c20b34
f6ed526b
81b381b
bde00a2b
911bcea
84adc43a
0f050ea
34b3b53f
33cd463b
56d2e8f
0cfdd810
e52a2ea0
0029f0ac
3bae94d7
f1459604
ed2c9c60
10a36fb7
3ead4127
ff441883
4b7f724