Fixes #8607 - remove unnecessary module dependency resolution