Revert "Merge remote-tracking branch 'upstream/master' into pi"

This reverts commit 24d5557c5ca1365879ea42da4ba583503eed0730, reversing
changes made to c4ee254d0f33e001022104063a488ad445739f69.