Revert "Merge remote branch 'upstream/dev' into dev"

This reverts commit e72b24604a494478ad3ba6d2e29ccfe621ac5b67, reversing
changes made to 3423a34116df23ae1d812de3ea671460a48133ea.