Revert pull request #35