revert Paul's change for correctness