don't remove encryption without asking
Merge branch 'testing'