Bug 837845 - Fix a regression introduced by the fix; rs=Waldo a=akeybl