This reverts commit 6b2a96285b9bbe92d2c5e21830f21458f8be976d. The ccache builders are still failing. Looks like they need to be updated to get the llvm-zorg config change in 490633945677656ba75d42ff1ca9d4a400b7b243. I'll re-apply this as soon as the builders are updated.