revert pull #404
Merge pull request #407 from WalterBright/revert404

revert pull #404