This is on top of https://debbugs.gnu.org/cgi/bugreport.cgi?bug=35859