Switch to direct database deletion.

Closes #3587367

Merge request reports

Loading