diff --git a/common/battery_spring.c b/common/battery_spring.c
index 28baf58c33..4604671b8e 100644
--- a/common/battery_spring.c
+++ b/common/battery_spring.c
@@ -6,15 +6,31 @@
  */
 
 #include "host_command.h"
+#include "i2c.h"
 #include "smart_battery.h"
+#include "util.h"
 
-#define PARAM_CUT_OFF 0x0010
+#define PARAM_CUT_OFF_LOW  0x10
+#define PARAM_CUT_OFF_HIGH 0x00
 
 int battery_command_cut_off(struct host_cmd_handler_args *args)
 {
-	sb_write(SB_MANUFACTURER_ACCESS, PARAM_CUT_OFF);
-	sb_write(SB_MANUFACTURER_ACCESS, PARAM_CUT_OFF);
+	int rv;
+	uint8_t buf[3];
 
+	buf[0] = SB_MANUFACTURER_ACCESS & 0xff;
+	buf[1] = PARAM_CUT_OFF_LOW;
+	buf[2] = PARAM_CUT_OFF_HIGH;
+
+	i2c_lock(I2C_PORT_BATTERY, 1);
+	rv = i2c_xfer(I2C_PORT_BATTERY, BATTERY_ADDR, buf, 3, NULL, 0,
+		      I2C_XFER_SINGLE);
+	rv = i2c_xfer(I2C_PORT_BATTERY, BATTERY_ADDR, buf, 3, NULL, 0,
+		      I2C_XFER_SINGLE);
+	i2c_lock(I2C_PORT_BATTERY, 0);
+
+	if (rv)
+		return EC_RES_ERROR;
 	return EC_RES_SUCCESS;
 }
 DECLARE_HOST_COMMAND(EC_CMD_BATTERY_CUT_OFF, battery_command_cut_off,