Revert pull request #3466

Reverts #3466