Revert pull request #469

Incorrectly applied.