Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit ef7fe79ffc4a0725d51eb554db02fd8e3e73534d)