Revert "Ebuild Functions update"

This reverts commit 3b046483a9d656505198a67313a81dc0de1cf557.