Fix v1beta2 types having been copied incorrectly.

Closes #1645