Recover mxc_i2c from bad merge.