[Bug 625585] Suspend procedure still uses terminal switch