These changes should fix the breaks I made in Jenkins.