Revert "refactored import BVI"

This reverts commit def7905a952605493d1c06acd8c8334ee2605694.