Revert "v5 again"

This reverts commit 40ac31f2bbcd38fdc712c6e5d59e06a7399f352c.