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