Revert pull request #5