This reverts commit 693bf9523e. The commit did not contain the mentioned amendmends. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
693bf9523e