Immediately re-encrypt... Take II