This is a revert of 821ad16fa9 as Wolfgang doesn't like the new code. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
821ad16fa9