This reverts commit 38919f68.

Temporary revert to be able to see other failures until builders are
updated.