Merge "Revert "CHA for abstract methods.""