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