This reverts commit edc13bae54, reversing changes made to 90464f6049. Bootstrap tools generation is broken, and I don't know why yet.
edc13bae54
90464f6049