Revert "Merge branch 'tmp-patching-branch-sha' into bbb-test"

This reverts commit c0a6e2b9d40b3951254739551412454a1f6a24c9, reversing
changes made to 36d9492e322d5957c105ff0f73e2c6846a53b321.