Revert my two previous deliveries (back to r8806) to aply the good patch for vstats