6 months later, my Jenkins patches have been merged. https://github.com/jenkinsci/jenkins/pull/1914