Revert "Removing weird IF that was causing issues with loading eagerly relations." opens #339

This reverts commit 89e699faea5a75e1f18825f24930d944cfab95d1.