Switching to open-isns

Quite a big change, but that's what fate#316901 wanted.
The `return` is not needed and can be removed. The same in the changes below.