Added function to enable geometry output to be explicitly disabled