MODULES-1192 - turning on strict_variables was too bold as well