Revert "Fix cherry-pick not ended on drop to current branch"
Revert "Fix cherry-pick not ended on drop to current branch"

This reverts commit 9d6e36689316ce9d1a0636425753dde2ca2189e7.

artivilla/desktop,j-f1/forked-desktop,desktop/desktop,say25/desktop,desktop/desktop,say25/desktop,shiftkey/desktop,j-f1/forked-desktop,shiftkey/desktop,artivilla/desktop,desktop/desktop,j-f1/forked-desktop,say25/desktop,say25/desktop,artivilla/desktop,desktop/desktop,j-f1/forked-desktop,artivilla/desktop,shiftkey/desktop,shiftkey/desktop