Put back in commits that were lost in messed up reverted pull request

Git struggles