This will simplify backporting the following fix to the 1.20 branch. Reviewed-by: Adam Jackson <ajax@redhat.com>