We may be able to move the FxaClientWrapper here too.