My bad, the patch in #7 fixed the regression for me.

I was having issues earlier because an other user had genymotion running and
locked on the same machine, genymotion sometimes has issues to find the correct
session and times out when there are multiple users (uid) using it.