Merge "Fix changing package installer after rollback"