Moving back to 3.5-SNAPSHOT