Revert "Fix pkgversion for gcc"

This reverts commit 0ad068e79774df8b4119394ff7063bc9b384822a.
Derp

Change-Id: I40e0492eab7847733da791748083e6cb8bc91984
Signed-off-by: Paul Beeler <sparksco@gmail.com>