diff --git includes/VersioncontrolOperation.php includes/VersioncontrolOperation.php
index e8f1bb4..d45a33e 100644
--- includes/VersioncontrolOperation.php
+++ includes/VersioncontrolOperation.php
@@ -22,6 +22,13 @@ abstract class VersioncontrolOperation extends VersioncontrolEntity {
   public $vc_op_id;
 
   /**
+   * Who actually perform the change on the repository.
+   *
+   * @var string
+   */
+  public $committer;
+
+  /**
    * The time when the operation was performed, given as
    * Unix timestamp. (For commits, this is the time when the revision
    * was committed, whereas for branch/tag operations it is the time
@@ -62,29 +69,6 @@ abstract class VersioncontrolOperation extends VersioncontrolEntity {
   public $author;
 
   /**
-   * The Drupal user id of the operation author, or 0 if no Drupal user
-   * could be associated to the author.
-   *
-   * @var int
-   */
-  public $author_uid;
-
-  /**
-   * Who actually perform the change on the repository.
-   *
-   * @var string
-   */
-  public $committer;
-
-  /**
-   * The Drupal user id of the operation committer, or 0 if no Drupal user
-   * could be associated to the author.
-   *
-   * @var int
-   */
-  public $committer_uid;
-
-  /**
    * The repository where this operation occurs.
    *
    * @var VersioncontrolRepository
@@ -116,6 +100,14 @@ abstract class VersioncontrolOperation extends VersioncontrolEntity {
   public $labels = array();
 
   /**
+   * The Drupal user id of the operation author, or 0 if no Drupal user
+   * could be associated to the author.
+   *
+   * @var int
+   */
+  public $uid;
+
+  /**
    * An array of VersioncontrolItem objects affected by this commit.
    *
    * @var array
diff --git includes/views/versioncontrol.views.inc includes/views/versioncontrol.views.inc
index 52fdb9a..1a9d474 100755
--- includes/views/versioncontrol.views.inc
+++ includes/views/versioncontrol.views.inc
@@ -201,7 +201,16 @@ function versioncontrol_views_data() {
       'handler' => 'views_handler_argument_date',
     ),
   );
-
+  $data['versioncontrol_operations']['uid'] = array(
+    'title' => t('User'),
+    'help' => t('The user that did the operation'),
+    'relationship' => array(
+      'base'  => 'users',
+      'base field' => 'uid',
+      'handler' => 'views_handler_relationship',
+      'label' => t('User'),
+    ),
+  );
   $data['versioncontrol_operations']['author'] = array(
     'title'    => t('Author'),
     'help'     => t('The Operation Author'),
@@ -218,18 +227,6 @@ function versioncontrol_views_data() {
       'handler' => 'views_handler_argument_string',
     ),
   );
-
-  $data['versioncontrol_operations']['author_uid'] = array(
-    'title' => t('User'),
-    'help' => t('The user that did the operation'),
-    'relationship' => array(
-      'base'  => 'users',
-      'base field' => 'uid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User'),
-    ),
-  );
-
   $data['versioncontrol_operations']['committer'] = array(
     'title'    => t('Commiter'),
     'help'     => t('The Operation Commiter'),
@@ -246,18 +243,6 @@ function versioncontrol_views_data() {
       'handler' => 'views_handler_argument_string',
     ),
   );
-
-  $data['versioncontrol_operations']['committer_uid'] = array(
-    'title' => t('User'),
-    'help' => t('The user that did the operation'),
-    'relationship' => array(
-      'base'  => 'users',
-      'base field' => 'uid',
-      'handler' => 'views_handler_relationship',
-      'label' => t('User'),
-    ),
-  );
-
   $data['versioncontrol_operations']['revision'] = array(
     'title'    => t('Revision'),
     'help'     => t('The Operation Revision Identifier'),
diff --git versioncontrol.install versioncontrol.install
index b6bca10..89cec84 100644
--- versioncontrol.install
+++ versioncontrol.install
@@ -46,6 +46,14 @@ function versioncontrol_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
+      'uid' => array(
+        'description' =>
+          'The {users}.uid for the Drupal user corresponding to the VCS-specific username in {versioncontrol_operations}.username, if such an association can be found. 0 otherwise. (The account associations are retrieved from the {versioncontrol_accounts} table.',
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
       'author' => array(
         'description' => 'VCS specific username of the user who is the original author of this operation. For centralized version control systems this and committer are the same.',
         'type' => 'varchar',
@@ -53,14 +61,6 @@ function versioncontrol_schema() {
         'not null' => TRUE,
         'default' => '',
       ),
-      'author_uid' => array(
-        'description' =>
-          'The {users}.uid for the Drupal user who authored this commit, corresponding to the value in {versioncontrol_operations}.author. If no such association can be found, then 0.',
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
       'committer' => array(
         'description' => 'VCS specific username of the user who executed this operation. For distributed version control systems, this should be the author, not the committer. For centralized version control systems this and author are the same.',
         'type' => 'varchar',
@@ -68,14 +68,6 @@ function versioncontrol_schema() {
         'not null' => TRUE,
         'default' => '',
       ),
-      'committer_uid' => array(
-        'description' =>
-          'The {users}.uid for the Drupal user who made this commit (but perhaps was not the author), corresponding to the value in {versioncontrol_operations}.committer. If no such association can be found, then 0.',
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
       'revision' => array(
         'description' =>
           'VCS specific global revision identifier, like "1234" for Subversion or some SHA-1 hash for various distributed version control systems. Empty string if the VCS does not support atomic commits / global revisions.',
@@ -95,10 +87,9 @@ function versioncontrol_schema() {
       'type' => array('type'),
       'repo_id' => array('repo_id'),
       'date' => array('date'),
+      'uid' => array('uid'),
       'author' => array('author'),
-      'author_uid' => array('author_uid'),
       'committer' => array('committer'),
-      'committer_uid' => array('committer_uid'),
       'revision' => array('revision'),
     ),
     'primary key' => array('vc_op_id'),
@@ -803,34 +794,3 @@ function versioncontrol_update_6306() {
 
   return $ret;
 }
-
-/* Allow independent uid mappings for both author and committer data.
- *
- * @return array
- */
-function versioncontrol_update_6307() {
-  $ret = array();
-  $author_uid_spec = array(
-    'description' =>
-      'The {users}.uid for the Drupal user who authored this commit, corresponding to the value in {versioncontrol_operations}.author. If no such association can be found, then 0.',
-    'type' => 'int',
-    'unsigned' => TRUE,
-    'not null' => TRUE,
-    'default' => 0,
-  );
-  $committer_uid_spec = array(
-    'description' =>
-      'The {users}.uid for the Drupal user who made this commit (but perhaps was not the author), corresponding to the value in {versioncontrol_operations}.committer. If no such association can be found, then 0.',
-    'type' => 'int',
-    'unsigned' => TRUE,
-    'not null' => TRUE,
-    'default' => 0,
-  );
-
-  db_add_field($ret, 'versioncontrol_operations', 'committer_uid', $committer_uid_spec);
-  db_change_field($ret, 'versioncontrol_operations', 'uid', 'author_uid', $author_uid_spec);
-
-  // Safe initialization that'll get some good values in for the committer uid.
-  db_query('UPDATE {versioncontrol_operations} SET committer_uid = author_uid WHERE (committer = author OR committer = "")');
-  return $ret;
-}