Rollback because of JENKINS-21977.