Revert "Merge branch 'pull-1091'"

This reverts commit 1fda95b6aea55cb216074b18bbb34fd8708c64c0, reversing
changes made to 0fd39c445a7a3e58ea9ae5ce605e6b01201b4d07.

Daniel Beck confirmed that I wasn't supposed to merge both 1090 and
1091. After discussion with him, I'm taking 1090.

See: https://github.com/jenkinsci/jenkins/commit/1fda95b6aea55cb216074b18bbb34fd8708c64c0#commitcomment-5112285