Revert PR #23 

here is the PR reverting #23.