This reverts commit 372a14c6. We shoul not have cherry-picked 28ae4ff0 without also cherry-picking 2223ea98, but the latter is too complex for a stable branch.