this one really fixes the problem. One more optimization coming later (separately). This commit was SVN r21983.