diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index cef3db2..1c3a016 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -59,11 +59,3 @@ include device/google/zuma/BoardConfig-common.mk
 include device/google/shusky-sepolicy/husky-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk
 
-# Android Virtualization Framework (AVF) team is using husky with hypervisor in
-# nvhe mode as a development platform to build infrastructure that supports
-# assigning devices to guest VMs.
-#
-# TODO(b/278008514): remove this once we have builds from our kernel branch.
-ifeq ($(HUSKY_ENABLE_DEVICE_ASSIGNMENT), true)
-BOARD_KERNEL_CMDLINE += kvm-arm.mode=nvhe
-endif