Calling get_base_object is no longer needed, this speeds things up by not unnecessarily downloading metadata. (cherry picked from commit 666d7f1e03)
666d7f1e03
And adjust tests to match.