8187556: Backout of a fix reintroduced a dependency that had since been removed

Reviewed-by: duke
13 files changed