This fixes #8301.  It now replaces "+" with "_".