CDB-1964 crappy solution but allows to not leave user at inconsistent half-deleted state