Revert pull request #407

Target: 1.7.2.