diff --git a/board/elm/board.c b/board/elm/board.c
index 840da0bd8a..29b77a5889 100644
--- a/board/elm/board.c
+++ b/board/elm/board.c
@@ -238,7 +238,7 @@ static void board_init(void)
 	board_reset_pd_mcu();
 
 	/* Update VBUS supplier */
-	usb_charger_vbus_change(0, !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L));
+	usb_charger_vbus_change(0, pd_snk_is_vbus_provided(0));
 
 	/* Remap SPI2 to DMA channels 6 and 7 */
 	REG32(STM32_DMA1_BASE + 0xa8) |= (1 << 20) | (1 << 21) |
diff --git a/board/elm/board.h b/board/elm/board.h
index 953b296a09..224bb7723a 100644
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -93,7 +93,6 @@
 #define CONFIG_USB_PD_TCPM_MUX
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_USB_PD_TRY_SRC
-#define CONFIG_USB_PD_TCPM_VBUS
 #undef  CONFIG_TCPC_I2C_BASE_ADDR
 #define CONFIG_TCPC_I2C_BASE_ADDR 0x58
 #define CONFIG_USB_PD_ANX7688
diff --git a/board/elm/usb_pd_policy.c b/board/elm/usb_pd_policy.c
index adfd814a6f..e54ad16c93 100644
--- a/board/elm/usb_pd_policy.c
+++ b/board/elm/usb_pd_policy.c
@@ -95,6 +95,11 @@ void typec_set_input_current_limit(int port, uint32_t max_ma,
 	charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge);
 }
 
+int pd_snk_is_vbus_provided(int port)
+{
+	return !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L);
+}
+
 int pd_board_checks(void)
 {
 	return EC_SUCCESS;