Hand-apply 22c79dac4ae2b01b448cc5886f8e8ff3a0cfb69b from master; fix broken still...