Reapplied the fixed needed to I2C after a horrific merge failure