revert pull #2454
Merge pull request #2468 from WalterBright/revert2454

revert pull #2454