Revert "addin support to v5"

This reverts commit fd3ca27bc7b5b98b30c67502388f837893340db2.