Revert "Revert previous (test) config change."

This reverts commit b63eefd1a30651a59ef204f26200c977252dfa7c.