Revert "use upstream 2.0.0rc1 tag"

This reverts commit 7ac9b279891de427121c5716f7fc005052bf679b.