Just squash this commit into the other and then rebuild patches and force push