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