Revert to 2.1.0-SNAPSHOT