Revert "Take care what you're deleting"

This reverts commit d8f5aae81c8e3e2ab9c3eb9ceb166dc195a5dbe8.
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into i9300-cm-experimental