Quick fix to index dropping, without using IF EXISTS clause, per bug #15896