Revert "Merge remote-tracking branch 'origin/B1' into B2"

This reverts commit 578138b17d18a4b764959628c8bdc8872c95c146, reversing
changes made to aa91cb4d7b79d8c4a012d9f2cabad7a814408352.