2.6.0 changed again...