Revert "Merge branch 'luks-decorator'"

Authored by stikonas.