Reverting 2fde657 to fix #67 (lazy loading fails)

Reverts 2fde657
Fixes #67