Revert various sonar and baro related changes.