Follow a backward incompatibility improvement change