Update for base behavior change.