Revert back to 0.9.8-SNAPSHOT