Revert "v1 fix"

This reverts commit 5a38b9bb70e25b2c0ed94d4870f62dd03bd6a01a.
Revert "Revert "v1 fix""

This reverts commit 1720e3fcf264122a31c8a56cafb39c88f67edb6c.