Partially revert 02fa9a3 and 0137433

CatalogUtils require access to installation base directory and
integration cannot be used to provide absolute paths.