Introduce more permanent fix for problem outlined in 1.21
Introduce more permanent fix for problem outlined in 1.21

zcth428/hpctoolkit,HPCToolkit/hpctoolkit,zcth428/hpctoolkit,HPCToolkit/hpctoolkit,HPCToolkit/hpctoolkit,zcth428/hpctoolkit,HPCToolkit/hpctoolkit,zcth428/hpctoolkit111,zcth428/hpctoolkit,zcth428/hpctoolkit111,zcth428/hpctoolkit111,zcth428/hpctoolkit,zcth428/hpctoolkit111,HPCToolkit/hpctoolkit,HPCToolkit/hpctoolkit,zcth428/hpctoolkit111