Revert pull request #1