This reverts commit ea61458f16. This was causing panic in the plugins because the client and the plugin API changed with this PR
ea61458f16