Revert "Address LoaderException during scan"

This reverts commit 43db460e642624c08ec3d690ce6a04351ce79965.