Revert "Merge pull request #843"

Revert PR #843