Merge "Add back include that was removed."