Yeah, as mentioned above, this is unnecessary API change that would be good if we could avoid.