revert #16672 for incorrect semantics
2 files changed