Why don't we just always include them instead of adding an option?