Revert "Merge branch 'v1'"

This reverts commit 7a6d196c408170469ca1d660f0198a26fa95d83b, reversing
changes made to c912110b0b5b57283844d3f002b7bc3cc9404f63.
Revert "Revert "Merge branch 'v1'""

This reverts commit f07b568e85a2b1f195c6eb01371408a52cfeb9e1.