Probably better to actually use the global config
Apply bbrowning's fix for TORQUE-983 and IMMUTANT-203