Revert "commit B-2"

This reverts commit d1eb01deabbebae411b5cc3958e8b2d973a7e480.
Revert "commit B-1"

This reverts commit b0587046871f49b05859a4cede5556c3feba64f8.