bug 872992 - clean up leo and hamachi hardcodes
Follow up to bug 872992 - Undo changes to gtest