General cleanup to see if changing the class helps with building in Jenkins.