REVERT: partly revert change to ensure context is the same (PR #10012)

GitHub