Add skip rebased so it doesn't bork on usage