Cleaned back to 0.9.1-SNAPSHOT