Revert "Revert "Revert "v3"""

This reverts commit f5878884ed2ce287221263059253e8cb40adac52.