Revert "lazyloader no longer needed."

This reverts commit 269c9905cffc9aafa2e9077170ce4153bb419fa0.