No need to care about conflicting patches. This reverts commit 560839ce81.
560839ce81
git pull --rebase