diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
index 860b3ad..0e434b8 100644
--- a/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -819,23 +819,22 @@ function theme_user_permission_description($variables) {
  * @see theme_user_admin_roles()
  */
 function user_admin_roles($form, $form_state) {
-  $roles = db_select('role', 'r')
-    ->addTag('translatable')
-    ->fields('r')
-    ->orderBy('weight')
-    ->execute()
-    ->fetchAllAssoc('name');
+  $roles = user_roles();
 
   $form['roles'] = array(
     '#tree' => TRUE,
   );
   $order = 0;
-  foreach ($roles as $role_name => $role) {
-    $form['roles'][$role_name]['#role'] = $role;
-    $form['roles'][$role_name]['#weight'] = $order;
-    $form['roles'][$role_name]['weight'] = array(
+  foreach ($roles as $name => $label) {
+    $form['roles'][$name]['#role'] = (object) array(
+      'name' => $name,
+      'label' => $label,
+      'weight' => $order,
+    );
+    $form['roles'][$name]['#weight'] = $order;
+    $form['roles'][$name]['weight'] = array(
       '#type' => 'textfield',
-      '#title' => t('Weight for @title', array('@title' => $role_name)),
+      '#title' => t('Weight for @title', array('@title' => $label)),
       '#title_display' => 'invisible',
       '#size' => 4,
       '#default_value' => $order,