Merge pull request #11152 from ctiller/toolz

Remove OSS-only tooling