diff --git a/flight/Bootloaders/CopterControl/pios_board.c b/flight/Bootloaders/CopterControl/pios_board.c
index 844670a6e..245f78297 100644
--- a/flight/Bootloaders/CopterControl/pios_board.c
+++ b/flight/Bootloaders/CopterControl/pios_board.c
@@ -67,7 +67,6 @@ void PIOS_Board_Init(void) {
 			PIOS_LED_Init(&pios_led_cfg_cc);
 			break;
 		case 0x02: // Revision 2
-			GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
 			PIOS_LED_Init(&pios_led_cfg_cc3d);
 			break;
 		default:
diff --git a/flight/CopterControl/System/pios_board.c b/flight/CopterControl/System/pios_board.c
index 11a6c4386..4102bd195 100644
--- a/flight/CopterControl/System/pios_board.c
+++ b/flight/CopterControl/System/pios_board.c
@@ -161,7 +161,6 @@ void PIOS_Board_Init(void) {
 			PIOS_LED_Init(&pios_led_cfg_cc);
 			break;
 		case 0x02: // Revision 2
-			GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
 			PIOS_LED_Init(&pios_led_cfg_cc3d);
 			break;
 		default:
diff --git a/flight/board_hw_defs/coptercontrol/board_hw_defs.c b/flight/board_hw_defs/coptercontrol/board_hw_defs.c
index 43f9360b8..0ac796b88 100644
--- a/flight/board_hw_defs/coptercontrol/board_hw_defs.c
+++ b/flight/board_hw_defs/coptercontrol/board_hw_defs.c
@@ -59,6 +59,7 @@ static const struct pios_led pios_leds_cc3d[] = {
 				.GPIO_Speed = GPIO_Speed_50MHz,
 			},
 		},
+		.remap = GPIO_Remap_SWJ_JTAGDisable,
 	},
 };