This reverts commits d60039d1 and 32272824.
Turns out, the NVC++ crashes in CI were caused by compiler cache, so these workarounds are not needed.