Revert "upstreamed, reserched fixes Gifted unto pentoo"

This reverts commit f903ef29bcf4114700084f14dc82ae3cd9e21b60.
un do a few of packages

blshvk didnt like all of them