Didn't realize that Bug#39596 was merged with this one, I'll attach my
patch here just in case.

- Fede