Revert "do some eager loading"

This reverts commit 7b5b19c9efbc146612724b9424c0b4f0e73affbd.