(issue 2944) reverting r83704 changes as per Barry Warsaw request
3 files changed