diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h
index fd0971294c..3dbe917ee2 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.h
+++ b/assignment-client/src/avatars/AvatarMixerClientData.h
@@ -81,7 +81,7 @@ private:
     AvatarData _avatar;
     
     uint16_t _lastReceivedSequenceNumber { 0 };
-    std::unordered_map<QUuid, uint16_t, UUIDHasher> _lastBroadcastSequenceNumbers;
+    std::unordered_map<QUuid, uint16_t> _lastBroadcastSequenceNumbers;
 
     bool _hasReceivedFirstPackets = false;
     quint64 _billboardChangeTimestamp = 0;
diff --git a/libraries/networking/src/UUID.h b/libraries/networking/src/UUID.h
index b8cb1b56ca..7e7048486f 100644
--- a/libraries/networking/src/UUID.h
+++ b/libraries/networking/src/UUID.h
@@ -18,10 +18,4 @@ const int NUM_BYTES_RFC4122_UUID = 16;
 
 QString uuidStringWithoutCurlyBraces(const QUuid& uuid);
 
-template <> struct std::hash<QUuid> {
-    size_t operator()(const QUuid& uuid) const {
-        return qHash(uuid);
-    }
-};
-
 #endif // hifi_UUID_h
diff --git a/libraries/networking/src/UUIDHasher.h b/libraries/networking/src/UUIDHasher.h
index 3ece236812..b05e517841 100644
--- a/libraries/networking/src/UUIDHasher.h
+++ b/libraries/networking/src/UUIDHasher.h
@@ -20,9 +20,13 @@
 class UUIDHasher {
 public:
     size_t operator()(const QUuid& uuid) const {
-        return uuid.data1 ^ uuid.data2 ^ (uuid.data3 << 16)
-            ^ ((uuid.data4[0] << 24) | (uuid.data4[1] << 16) | (uuid.data4[2] << 8) | uuid.data4[3])
-            ^ ((uuid.data4[4] << 24) | (uuid.data4[5] << 16) | (uuid.data4[6] << 8) | uuid.data4[7]);
+        return qHash(uuid);
+    }
+};
+
+template <> struct std::hash<QUuid> {
+    size_t operator()(const QUuid& uuid) const {
+        return qHash(uuid);
     }
 };