@adamv I'd rather we didn't pull patches like this that are desirable but not necessary for the tool to work.