Merge "Revert "Implement IRPC v2 behavior in v3""