Merge "Revert "Reject classes inheriting from themselves directly or transitively."" into nyc-dev