* Revert r103476, r105161 and implement the fix for bug 32858 (a.k.a. bug 32450)...