bring back 'lazyload' changes

This reverts commit db093cf2db93ae199e767272496a3f65eeee3747.