Revert Tools.current hack for now