Fix Issue 11591 by workarounding Issue 11557.

Issue URL: https://d.puremagic.com/issues/show_bug.cgi?id=11591
Workarounding issue URL: https://d.puremagic.com/issues/show_bug.cgi?id=11557