Revert pull request #1997

Pressed wrong button, this was meant to be closed.