diff --git a/boot/bootutil/src/bootutil_misc.c b/boot/bootutil/src/bootutil_misc.c
index 46aaa61..1b26636 100644
--- a/boot/bootutil/src/bootutil_misc.c
+++ b/boot/bootutil/src/bootutil_misc.c
@@ -580,13 +580,16 @@
     return BOOT_SWAP_TYPE_NONE;
 }
 
+/*
+ * This function is not used by the bootloader itself, but its required API
+ * by external tooling like mcumgr.
+ */
 int
 boot_swap_type(void)
 {
     return boot_swap_type_multi(0);
 }
 
-
 /**
  * Marks the image in the secondary slot as pending.  On the next reboot,
  * the system will perform a one-time boot of the the secondary slot image.
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 71ebb11..1166907 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -949,11 +949,7 @@
 {
     int swap_type;
 
-#if (BOOT_IMAGE_NUMBER == 1)
-    swap_type = boot_swap_type();
-#else
     swap_type = boot_swap_type_multi(BOOT_CURR_IMG(state));
-#endif
     switch (swap_type) {
     case BOOT_SWAP_TYPE_TEST:
     case BOOT_SWAP_TYPE_PERM: