Revert bugpoint change due to buildbot breakage.