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