Revert "v3 update"

This reverts commit cd202de85fe7af07ab0fb0ab7dbdde6c939de91a.