There have been a number of regressions caused by our inability
to thoroughly review relatiohships' loading strategies. We should
at least make an attempt to remind ourselves, and since I am guilty
as charged, this patch is my attempt to redemption.
Change-Id: I879cfceaa51386e9d6c683e7e02487df92b7e290
fce62cf424