Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> (cherry picked from commit 87aa98aa80)
87aa98aa80