Fixes #4887. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 1d0487f77f)
1d0487f77f