Rebase went wrong and XSS was reopened