Fixes #5255 - Version destroy plan takes 20+ minutes