Changes after REVIEW-4583.