There's an open PR for this here: https://github.com/jenkinsci/jenkins/pull/3083
Just leaving this here for others searching for `newbie-friendly` and expecting PRs to be linked in the issue. (I had pretty much the same changes done already)