Apply hack from 1.16wmf4 in r71329 to trunk (follow-up to r71327). The version in...