Revert "Change detect isSoftDeletable"

This reverts commit 99381baabb99dc6df610e2286b737643be213e14.