Reverse older changes to individual tools. Modified static methods to be
in namespace to avoid modifying tools.