Comment 3 for bug 159232

Applied revised patch to avoid additional testing dependency in 3.12 branch rev 111334. I don't think this fixes all issues hidden in the code but it definitely improves the situation. (Why can't an empty string be a value? If I allow it another test breaks.)