Revert "Build v2"

This reverts commit e341594ffeabb2cac3279318c24affe5e8a0ecb7.
Revert "Revert "Build v2""

This reverts commit 39cc4c7834d62db548a0540ee7b59215cdd16650.