Move back to 2.5-SNAPSHOT
Fix code that got lost in a merge