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

This reverts commit a83032e3a07f5b8f72b4921bdc88ba654231482e, reversing
changes made to 50d466b43bb23c289c441d409b0ae27de86a9ba0.