keep waive_setup flag when changing package, #613