Revert "Changed loading behavior"

This reverts commit f1643d468bce14acc9738f970be3f5b90f7b4a0a.