Another attempt to fix dependency problems.