Issue #2281109: Porting 'Entity is of type (entity_is_of_type)' condition to 8.x. Removing unnecessary code/comments, etc.