Merge "Fix bad nesting count when remote calls fail."