Revert "Merge branch 'luks-decorator'"
This reverts commit 54ce33b472697d31f4ec280a154a739ddba6bca9, reversing changes made to 98d08a81c5e1527bf4b35298b7bfaf76bb5d0a2a.