[PATCH 1/2] Fix up calling superclass setup methods in packaging (#870556).