Revert "Immediately re-encrypt"

This reverts commit 2e2c9ce48952777b4992295143f924e1011b781c.