diff --git a/src/groupdb.js b/src/groupdb.js
index 787d8b33e..2f2813054 100644
--- a/src/groupdb.js
+++ b/src/groupdb.js
@@ -19,7 +19,7 @@ exports = module.exports = {
     getMembership: getMembership,
     setMembership: setMembership,
 
-    getRoles: getRoles,
+    getGroups: getGroups,
 
     _clear: clear
 };
@@ -284,7 +284,7 @@ function isMember(groupId, userId, callback) {
     });
 }
 
-function getRoles(userId, callback) {
+function getGroups(userId, callback) {
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
@@ -295,6 +295,6 @@ function getRoles(userId, callback) {
 
         results.forEach(postProcess);
 
-        callback(null, _.uniq(_.flatten(results.map(function (r) { return r.roles; }))));
+        callback(null, results);
     });
 }
diff --git a/src/groups.js b/src/groups.js
index 6a8adcf2c..2c72bf4f8 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -19,7 +19,7 @@ exports = module.exports = {
     removeMember: removeMember,
     isMember: isMember,
 
-    getRoles: getRoles,
+    getGroups: getGroups,
 
     setMembership: setMembership,
     getMembership: getMembership
@@ -270,14 +270,14 @@ function update(groupId, data, callback) {
     });
 }
 
-function getRoles(userId, callback) {
+function getGroups(userId, callback) {
     assert.strictEqual(typeof userId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    groupdb.getRoles(userId, function (error, roles) {
+    groupdb.getGroups(userId, function (error, results) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
         if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
 
-        callback(null, roles);
+        callback(null, results);
     });
 }
diff --git a/src/test/groups-test.js b/src/test/groups-test.js
index bebc6078e..74cf8ea50 100644
--- a/src/test/groups-test.js
+++ b/src/test/groups-test.js
@@ -414,9 +414,9 @@ describe('Roles', function () {
     });
 
     it('can get roles of a user', function (done) {
-        groups.getRoles(USER_0.id, function (error, roles) {
-            expect(roles.length).to.be(1);
-            expect(roles[0]).to.be('owner');
+        groups.getGroups(USER_0.id, function (error, results) {
+            expect(results.length).to.be(1);
+            expect(results[0].roles).to.eql([ 'owner' ]);
             done();
         });
     });