This reverts commit 87b7f63a11, reapplying 7e66cf74fb with a small (and probably temporary) change to generate more debug info to help with diagnosing buildbot issues.
87b7f63a11
7e66cf74fb