Backport earlier fix wrt AsArraySerializerBase