Revert to 0.6 codebase, bump version to 0.8