more sane check for suppressing tools
(cherry picked from commit 07c8d3b r=Alexey Kudravtsev)