rolling back to 1.6-SNAPSHOT