Patch sent out as:

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=35312

Björn