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

This reverts commit b3d873ed19edbbb7beb8a1e2579e6b8b90c13f0c, reversing
changes made to 8e550f6332da2cd0406688e89d6658c2afcb1cf3.
Revert b3d873e..b0e259e

This rolls back to commit b3d873ed19edbbb7beb8a1e2579e6b8b90c13f0c.
Revert d2193d2..dd4f113

This rolls back to commit d2193d2762eb938a2c8a28e0683492a26cec183d.