i'd accept a patch to make it optional