This reverts commit dea3bdb050a55d56a1913e50e59cf176d70d3eb7.
This revert is necessary because it changed jenkins jobs before the
slave images could be rebuilt. We need to update the slave images first
then update the jenkins jobs in a pair of changes that can be merged one
at a time.
Change-Id: Iae4abf8c2dd8ad67ad008c57bbd17ba1304134c6