It turns out these hacks (introduced for refs: #17056) worked around a real bug, not a test suite issue, so we are gonna fix the real bug instead (refs: #17121).