REVIEW-3025: Simplified code.