Revert accidental merge of rolling-upgrade branch.

This reverts commit 56817706e924e1a0b0dbab748a6287a5c2127df9.