diff --git a/NEWS b/NEWS
index a6c80ee6a7df615fa9840f2fe2ddf559ff41f297..249d8127efdd95b386555b17ab08bed250f49a25 100644
--- a/NEWS
+++ b/NEWS
@@ -359,8 +359,6 @@ documents those changes that are of interest to users and administrators.
     and --distribution=arbitrary.
  -- Fix segfault in Bluegene setups where RebootQOSList is defined in
     bluegene.conf and accounting is not setup.
- -- Fix a bug in the unit conversion routine, specify the correct
-    divisor based on the selected unit, KILO, MEGA or GIGA.
  -- MYSQL - Update mod_time when updating a start job record or adding one.
  -- MYSQL - Fix issue where if an association id ever changes on at least a
     portion of a job array is pending after it's initial start in the
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index a42303945654d79393e3d26532226b2d4fc97d27..0620fd98905ae55b038cb1758e6158d4159e9f82 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -4350,27 +4350,7 @@ extern void convert_num_unit2(double num, char *buf, int buf_size,
 
 extern void convert_num_unit(double num, char *buf, int buf_size, int orig_type)
 {
-        int unit;
-
-        switch (orig_type) {
-                case UNIT_NONE:
-                case UNIT_KILO:
-                case UNIT_UNKNOWN:
-                        unit = 1024;
-                        break;
-                case UNIT_MEGA:
-                        unit = 1024 * 1024;
-                        break;
-                case UNIT_GIGA:
-                case UNIT_TERA:
-                case UNIT_PETA:
-                        /* For TERA e PETA an int is not enough
-                         */
-                        unit = 1024 * 1024 * 1024;
-                        break;
-        }
-
-	convert_num_unit2(num, buf, buf_size, orig_type, unit, true);
+	convert_num_unit2(num, buf, buf_size, orig_type, 1024, true);
 }
 
 extern int revert_num_unit(const char *buf)