Import fix from preempt branch.