Revert pull request #27 until it comes with unit tests.