revert pull request #1812