Revert pull request #469
Merge pull request #470 from github/revert-469

Revert pull request #469