revert pull request #11 since it breaks a lot of tests