Remove the delay workarounds. We don't need them now that the scheduler unwinds properly.