The patch has been brought into Ubuntu 20.04.3 and is no longer needed. Signed-off-by: Richard Laager <rlaager@wiktel.com>