It should be, but that's outside the scope of this patch. I kept things the way they were while removing the symkey, which was nontrivial.