Revert "For children of Client use self. instead of a new Client()"

Testing if reverting this fixes the build problems.

This reverts commit 389bd22b9dcf61310f963880c359a92927f0f7d3.