Can we leave this dependency alone, tackle in a separate, atomic pull request?