Rolled back commit which added self as field variable.

It seemed to introduce some issues on re-use of the same device over several re-connects, so let's just stick with the extra few lines of code.