revert pull 1325
Merge pull request #2547 from WalterBright/revert-pull-1325

revert pull 1325