Rebase to legacymod stock