Revert "Make client requireable"

This reverts commit c7677c4ca8f2cd5101243ed5aa3aa2634021230d.