Upstreaming some more dependencies so we can time them.