Remove the reliance on relative accuracy of short delays (#7656)