This reverts commit e6f77d5d72. Commit contained unrelated changes. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
e6f77d5d72