Revert pull request #3466