Revert "Merge branch 'master' into b1"

This reverts commit 1ae89b81b23deffea2afb5ecaeb02045d41e900b, reversing
changes made to 8f5a8e5cf5a8bbd616bddd49f73d768e2df5e58d.