Revert commit 6ecab258710d158a7a6 and only do not wait for swap via parameter

bnc#882812

Signed-off-by: Thomas Renninger <trenn@suse.de>