That's... weird.  This commit disappeared and broke the none cipher again.
Fixing.

(cherry picked from commit 2bb2fc9c5ce7fb50a1ca9c759bdb18ed3ad89066)

Ticket: #5714