Changed per CR review.