revert Jim's pull request 1537, new pull 1595 is correct