restore use controlled optional dependencies