Revert "v6"

This reverts commit 203232d6b82c7ebb5b4f8e72e39cdaab33882a29.