Revert "Merge remote-tracking branch 'upstream/dev'"

This reverts commit ae11f0192105ac606c26caf90fbb1404ecaf627a, reversing
changes made to 797a88f20354e1b662a64c5d9de291b3f17b3e5e.