diff --git a/flight/OpenPilot/System/pios_board.c b/flight/OpenPilot/System/pios_board.c
index 2334f7a33..22bf12cad 100644
--- a/flight/OpenPilot/System/pios_board.c
+++ b/flight/OpenPilot/System/pios_board.c
@@ -1176,21 +1176,9 @@ void PIOS_Board_Init(void) {
 			PIOS_Assert(rx_buffer);
 			if (PIOS_COM_Init(&pios_com_gps_id, &pios_usart_com_driver, pios_usart_gps_id,
 						rx_buffer, PIOS_COM_GPS_RX_BUF_LEN,
-						0, 0)) {
+						NULL, 0)) {
 				PIOS_Assert(0);
 			}
-	{
-		uint32_t pios_usart_gps_id;
-		if (PIOS_USART_Init(&pios_usart_gps_id, &pios_usart_gps_cfg)) {
-			PIOS_Assert(0);
-		}
-		uint8_t * rx_buffer = (uint8_t *) pvPortMalloc(PIOS_COM_GPS_RX_BUF_LEN);
-		PIOS_Assert(rx_buffer);
-		if (PIOS_COM_Init(&pios_com_gps_id, &pios_usart_com_driver, pios_usart_gps_id,
-				  rx_buffer, PIOS_COM_GPS_RX_BUF_LEN,
-				  NULL, 0)) {
-			PIOS_Assert(0);
->>>>>>> origin/CorvusCorax_unidirectional-GPS-com
 		}
 #endif	/* PIOS_INCLUDE_GPS */
 		break;