This reverts commit 525ed98b. Some buildbots are failing when linking bugpoint. Reverting to investigate that further.