[3058] Revert [3056]. It can be handled by DB

Thanks to @Neatelves