This is the only callsite; can we get rid of the boolean arg?