This reverts commit a809fdc8 and then achieves the same result (not rebuilding texinfo three times) but without dragging bootstrap tools into the closure.