Revert "Improved loader"

This reverts commit 51f359083333676ba1db52957aec2168ac0a5690.