reopen 43184 merge 43184 53334 thanks (Forgot to send it to control@debbugs.gnu.org)