Move back to two client types

Builds fine.