removes duplicated function from rebasing
Merge remote-tracking branch 'origin/issue-1276' into issue-1276