Revert pull request #34 because of test failures