[tools] revert r17022, this is not the way to do this