Issue #2283759 followup: it was still blowing up with certain types of entity reference scenarios