Feedback from bwalding https://issues.jenkins-ci.org/browse/JENKINS-38023?focusedCommentId=275020&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-275020