Unbroke more things after D3 upgrade.

4 jobs for d3upgrade in 2 minutes and 12 seconds (queued for 1 second)