Revert to 2.2.0-SNAPSHOT