Merge "Revert "Revert "CHA for abstract methods."""