CHANGE: Update in previous commit no longer has potential adverse performance impact.