diff --git a/system/i2c/i2c_dev.c b/system/i2c/i2c_dev.c
index e01d68892..23ab89a25 100644
--- a/system/i2c/i2c_dev.c
+++ b/system/i2c/i2c_dev.c
@@ -178,10 +178,6 @@ int i2ccmd_dev(FAR struct i2ctool_s *i2ctool, int argc, char **argv)
               continue;
             }
 
-          /* Set the I2C address */
-
-          I2C_SETADDRESS(dev, addr, 7);
-
           /* Set up data structures */
 
           regaddr       = 0;
diff --git a/system/i2c/i2c_get.c b/system/i2c/i2c_get.c
index 11ced453e..aa6a5b08b 100644
--- a/system/i2c/i2c_get.c
+++ b/system/i2c/i2c_get.c
@@ -144,10 +144,9 @@ int i2ccmd_get(FAR struct i2ctool_s *i2ctool, int argc, FAR char **argv)
        return ERROR;
     }
 
-  /* Set the frequency and the address (NOTE:  Only 7-bit address supported now) */
+  /* Set the iI2C frequency */
 
   I2C_SETFREQUENCY(dev, i2ctool->freq);
-  I2C_SETADDRESS(dev, i2ctool->addr, 7);
 
   /* Loop for the requested number of repititions */
 
diff --git a/system/i2c/i2c_set.c b/system/i2c/i2c_set.c
index 16cdebae8..e555ab0ab 100644
--- a/system/i2c/i2c_set.c
+++ b/system/i2c/i2c_set.c
@@ -172,10 +172,9 @@ int i2ccmd_set(FAR struct i2ctool_s *i2ctool, int argc, FAR char **argv)
        return ERROR;
     }
 
-  /* Set the frequency and the address (NOTE:  Only 7-bit address supported now) */
+  /* Set the I2C frequency */
 
   I2C_SETFREQUENCY(dev, i2ctool->freq);
-  I2C_SETADDRESS(dev, i2ctool->addr, 7);
 
   /* Loop for the requested number of repititions */
 
diff --git a/system/i2c/i2c_verf.c b/system/i2c/i2c_verf.c
index a964a4cbe..d6b4ec2a2 100644
--- a/system/i2c/i2c_verf.c
+++ b/system/i2c/i2c_verf.c
@@ -174,10 +174,9 @@ int i2ccmd_verf(FAR struct i2ctool_s *i2ctool, int argc, FAR char **argv)
        return ERROR;
     }
 
-  /* Set the frequency and the address (NOTE:  Only 7-bit address supported now) */
+  /* Set the I2C frequency */
 
   I2C_SETFREQUENCY(dev, i2ctool->freq);
-  I2C_SETADDRESS(dev, i2ctool->addr, 7);
 
   /* Loop for the requested number of repititions */