Maybe at this point we should just git revert