Merge "Revert^4 "CHA for interface method.""