Revert "Updated loader"

This reverts commit 3eef0341be0e0bc61fc91025ba41ba3a042a4b5f.