It looks like the code which was removed with this commit was not necessary anyways since con_move_to_workspace() by now checks on its own whether it moves to the scratchpad. fixes #913