but in any case, this API change should preserve the current behaviour.