Revert "Disable entity loader just in case"

This reverts commit f162be27fceb28781e4a080e460c219415215e9e.