Fix non-journal, non-block based payload encryption