... to unbreak 'git cherry-pick' and friends between branches. This reverts commit 296aca4e73. Resolves: #2164980, #2165743
296aca4e73