Revert "Merged from the latest upstream"

This reverts commit 5bc2ac69ff2c093792cc281be3e6345c2351d13c.