BZ 1038713: runtime dependency correction.