diff --git a/wpilibc/include/DigitalModule.h b/wpilibc/include/DigitalModule.h
index 1ab4c9bca2..b6a9206818 100644
--- a/wpilibc/include/DigitalModule.h
+++ b/wpilibc/include/DigitalModule.h
@@ -53,8 +53,8 @@ public:
 	I2C* GetI2C(uint32_t address);
 
 	static DigitalModule* GetInstance(uint8_t moduleNumber);
-	static uint8_t RemapDigitalChannel(uint32_t channel) { return channel; }; // TODO: Need channel validation
-	static uint8_t UnmapDigitalChannel(uint32_t channel) { return channel; }; // TODO: Need channel validation
+	static uint8_t RemapDigitalChannel(uint32_t channel) { return 15 - channel; }; // TODO: Need channel validation
+	static uint8_t UnmapDigitalChannel(uint32_t channel) { return 15 - channel; }; // TODO: Need channel validation
 
 private:
 	uint8_t m_module;
diff --git a/wpilibc/lib/DigitalInput.cpp b/wpilibc/lib/DigitalInput.cpp
index 9d5be54682..4de69f7068 100644
--- a/wpilibc/lib/DigitalInput.cpp
+++ b/wpilibc/lib/DigitalInput.cpp
@@ -105,7 +105,7 @@ uint32_t DigitalInput::GetChannel()
  */
 uint32_t DigitalInput::GetChannelForRouting()
 {
-	return DigitalModule::RemapDigitalChannel(GetChannel() - 1);
+	return GetChannel() - 1;
 }
 
 /**