Re-de-deploying this, as upgrades are complete.

This reverts commit 65d186fd76da7976f05a4020b0967511d4f45dc6

Change-Id: Ib39de47910a9de2c21b62fb6035d3b32fa9728b2
Merge "Re-de-deploying this, as upgrades are complete."