Revert to basing all timeout/timer values in ms rather than us. The switch