can't be bothered to cherry pick so we'll release 2.6.0 earlier