Revert "Disable entity loader just in case"

This reverts commit 9c8d26fa9be03f28aa553b8fdc3fba61d5af4c1b.