Revert "Initial v5 commit"

This reverts commit c1f2986eef79968bd1374dc2ae7dda0977f61a7b.