Also eliminate some duplicate code while we're at it. Fixes: #4684 Signed-off-by: Jo-Philipp Wich <jo@mein.io>