Revert unintended behavior change from PR #402
Revert unintended behavior change from PR #402