Revert "Switched to 2.0-SNAPSHOT again"

This reverts commit 39161c19605ca009de9824e86089ed386aef53ae.