Revert "upgrade to 6.1.1-SNAPSHOT"

This reverts commit d12d7f6c5477de7fef6d7c4decddd3765fbcfbe6.