Come back to optional dependency and not forced one.