r18210: - reenable autodependencies