Rollback PR #7967 in preference of fixing I2C start/stop properly, in a followup...