This reverts commit d4ffc36f.
That commit cherry-picked from 68a97bd8 in isolation, but should
really only be needed if we had also cherry-picked 387117ad.