remove static state for Tool.instance

@cos is this a better solution for you? Eventually, as you say, we should break this dependency, so I opted to go for the local modification instead.