Revert pull request #969