Revert "[OE-3856] soft deletion"

This reverts commit 51073208ce64178d3515abb272a0a0b2105ae212.