Revert "V1 first"

This reverts commit 8ea0cf35f229d471c891e4e3912302d48d746eef.