Revert "Roll back to initial load"

This reverts commit 6ae559ba4ca67df47be2ad2a55bf68202d376c3f.