@arunagw recommended I back up to the commit before the refactoring and force push. I'll put the changes after that into a new PR.