   
   # A private export consists of:
   #   1. The PGP public key block
-  #   2. The keybase message (Public and private keys, triplesec'ed)
+  #   2. The PGP private key block (Public and private keys, triplesec'ed)
   export_private_to_server : ({tsenc, asp}, cb) ->
     err = ret = null
-    if not (err = @_assert_signed())?
-      pgp = @pgp.export_keys { private : false }
-      await @keybase.export_keys { private : true, tsenc, asp }, defer err, keybase
-    ret = if err? then null else { pgp, keybase : box(keybase).toString('base64') }
+    unless (err = @_assert_signed())?
+      await @pgp.export_keys { private : false }, defer err, pub
+    unless err?
+      await @pgp.export_keys { private : true, tsenc, asp }, defer err, priv
+    unless err?
+      priv = priv.toString('base64')
+    ret = if err? then null else { pub, priv }
     cb err, ret
 
   #-----


  #--------

  export_keys : (opts) ->
    packets = [ @primary._pgp.export_framed(opts), @userid_packet().write(), @self_sig ]
    opts.subkey = true
    for subkey in @subkeys


  #--------------

  @import_from_triplesec_pgp : ({raw, base}, cb) ->
    await util.asyncify read_base64(raw), esc defer bin

  #--------------

  # Import from a dearmored/decoded PGP message.
  @import_from_pgp_message : ({msg, raw, asp, userid}, cb) ->
    bundle = null
