Added workaround for bug 12164.