Revert "works with v5"

This reverts commit 4ac8468dd52e2e57af19770787a5dfa0950b6c7d.