Reverting 2fde657 to fix #67 (lazy loading fails)
Merge pull request #68 from dankrause/issue-67

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