Fix bug 1010660 - Simplify tool links