Revert "Merge branch 'recampbell-jenkins-19587'"

This reverts commit a5384f10dad6a76c79995ac426feda84e08c9f8b, reversing
changes made to 9fac76f226b75f5224a42c3651a4ad107da10f46.