Revert "Merge remote-tracking branch 'updstream/master'"

This reverts commit 0334d34bb1ee79bbd3315b91218b3b653d686d32.