Revert merge of pull request #199.