Reapplies 794061a3298b5716db015defa7b3e2c583b73980.
In 85b101dd45fb4f8c3a898dbf7826e108c3fabcf6, 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>