Revert "Restore plugin loading customizations"

This reverts commit b034b61618d006a6fb678f2a07a7328069425b33.