Ludovic's hack from
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27691#49