Revert "Merge branch 'b1'"

This reverts commit 2409cd49c8e96047b88f8962d44b231b393a78c8, reversing
changes made to fa844020c98af3b3a545c4b64138eb3ae0a9a39d.