Rolled back to 2.6.0-rc3