Revert pull request #24