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