revert pull request #1481