Revert "Merge pull request #13 from cujo/new_internal_api"

This reverts commit 7235cc26826f40530b4ebaec132b417375277aaf.