Patch from Bug #28406: