Revert Gentoo changes (sigh)