This seems...extreme :-)

Fine short-time but maybe worth a follow-up bug to find a better solution here.