Revert to v1 branch