Merge "fix the TooManyDeletes to show up again"