CURATOR-166: Reverted to using two overloads in order to keep binary compatibiity and avoid uneeded array allocation.