Attempt to fix jenkins builds. Working on removing client dependency...