Backport fix for call location info onto 0.x