Is this change still necessary after the i2c fix?