Reapplies 794061a329. In 85b101dd45, a patch from 10 months before was merged without rebasing, and various changes were dropped. This is one of them. So reapply those changes. Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
794061a329
85b101dd45