Trac #T7881 now works for hpc way again

As a result of fixing Trac #8384