This reverts commit 52caa1dc96 since it contained unrelated changes. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
52caa1dc96