Reimplemented tick delay code that was clobbered during merge.