Toggle this optimization based on a config param