Revert "Hotfix for salt support in fedora-32 template"

This reverts commit 5e9fd0c.

dom0/sd-sys-vms.sls

@@ -17,27 +17,14 @@ dom0-install-fedora-template:
     - pkgs:
       - qubes-template-{{ sd_supported_fedora_version }}
 
-hotfix-fedora-template-salt-packages:
-  cmd.wait:
-    - name: >
-        qvm-run {{ sd_supported_fedora_version }}
-        "sudo dnf update --refresh --enablerepo=qubes-vm-r4.0-current-testing -y qubes-mgmt-salt-vm-connector"
-        && qvm-shutdown --wait {{ sd_supported_fedora_version }}
-    - require:
-      - pkg: dom0-install-fedora-template
-    - watch:
-      - pkg: dom0-install-fedora-template
-
 # If the VM has just been installed via package manager, update it immediately
 update-fedora-template-if-new:
   cmd.wait:
     - name: sudo qubesctl --skip-dom0 --targets {{ sd_supported_fedora_version }} state.sls update.qubes-vm
     - require:
       - pkg: dom0-install-fedora-template
-      - cmd: hotfix-fedora-template-salt-packages
     - watch:
       - pkg: dom0-install-fedora-template
-
 # qvm.default-dispvm is not strictly required here, but we want it to be
 # updated as soon as possible to ensure make clean completes successfully, as
 # is sets the default_dispvm to the DispVM based on the wanted Fedora version.
@@ -69,9 +56,6 @@ sd-{{ sys_vm }}-fedora-version-update:
       - template: {{ sd_supported_fedora_version }}
     - require:
       - cmd: sd-{{ sys_vm }}-fedora-version-halt-wait
-      # disp-mgmt-dvm will be running while template updates,
-      # wait for completion to avoid error
-      - cmd: update-fedora-template-if-new
 
 sd-{{ sys_vm }}-fedora-version-start:
   qvm.start: