Tweak r47992 to use instead of a new configuration variable. Also moved its preceden...