revert pull request #35