This reverts commit 542cee17
The script is intended to help those who get merge conflicts due to !3385.