Revert "Merge remote-tracking branch 'origin/master' into yesi"

This reverts commit 023488f524b6549dd08a777a7a489a9dcfd38034, reversing
changes made to 15969dc69cfbb167842d77c837dfcbb056a0f302.