Revert "Switch to Validus' own g3-common"

This reverts commit 8a3b302372ab46b65099d1444b5b8dc05f623195.