Reverted version to 2.1-SNAPSHOT