Revert pull request #367,this doesn't actually help