This reverts commit 66d5023891 since the original change was apparently untested. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
66d5023891