backports fe59c410cc6a48a041aa6bbedc1d1ad7220d238e