Revert "Fixed missed rebase pieces"

This reverts commit 89d40512a3ec319d0c9c3545486ef20202475b42.