Did we get rid of this because now we're returning `null` instead of an empty object?