78c4ffec99
This reverts commit a9975b144a, to prepare
for cherry-picking upstream's solution.
This reverts commit a9975b144a, to prepare
for cherry-picking upstream's solution.