Handle 2.10.4 library resolution changes.