Revert "Merge remote-tracking branch 'upstream/jb' into carbon"

This reverts commit 7d906f0c29162770c4e5ae6afc28a9d66988599a, reversing
changes made to f8316860b781ad3b45db81c974623f5c73db6a3f.