#1066398 follow-up to fix reverse entity relationships to not result in broken handlers since beta10.