Revert "Merge remote-tracking branch 'upstream/staging' into staging"

This reverts commit 374aed635ab2c06f124b2bedaf356477e0eb8f9e, reversing
changes made to 67d0ac59cccbe69897c286c0d9247a66919f3170.