Revert "branch person fix"

This reverts commit b094d98da6f0b7bdc52727c18c89ae332e93a1bd.
Revert "Revert "branch person fix""

This reverts commit 4a6002dcbec674c773f71af23eeacc104514de39.
Revert 4a6002d..1ed39ca

This rolls back to commit 4a6002dcbec674c773f71af23eeacc104514de39.
Revert 1ed39ca..5bd41bf

This rolls back to commit 1ed39ca999b3c339f800d623a3d5dcfa5a728f5f.
Revert "Revert "branch person fix""

This reverts commit 4a6002dcbec674c773f71af23eeacc104514de39.