Revert pull-request #4 from @jonathanmorley. It breaks backwards compatibility.
Started on unit-tests