Revert "WORKAROUND - fast delete for tests only"

This reverts commit 9b329e227908662303cae77c885adf4676ae95b0.