reverted both ebuilds to explicit handling of version hack