Yet another checkin attempting to fix jenkins build problem.