bug #2487: Always use the current system ds when resuming