Comment out some more code (failing in Jenkins only).