diff --git a/db/migrate/20170523073948_remove_assignee_id_from_issue.rb b/db/migrate/20170523073948_remove_assignee_id_from_issue.rb
index e310a6df9bd..6fe2bb9c770 100644
--- a/db/migrate/20170523073948_remove_assignee_id_from_issue.rb
+++ b/db/migrate/20170523073948_remove_assignee_id_from_issue.rb
@@ -32,5 +32,7 @@ class RemoveAssigneeIdFromIssue < ActiveRecord::Migration
   def down
     add_column :issues, :assignee_id, :integer
     add_concurrent_index :issues, :assignee_id
+
+    execute('UPDATE issues SET assignee_id = (SELECT user_id FROM issue_assignees WHERE issue_assignees.issue_id = issues.id LIMIT 1)')
   end
 end
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index a2d9a0332e0..753694a5392 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -138,7 +138,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
   private
 
   def assigned_to_me(key)
-    project.send(key).where(assignee_id: current_user.id)
+    project.send(key).assigned_to(current_user)
   end
 
   def project
diff --git a/spec/services/members/authorized_destroy_service_spec.rb b/spec/services/members/authorized_destroy_service_spec.rb
index 2d04d824180..d4ef31c0c74 100644
--- a/spec/services/members/authorized_destroy_service_spec.rb
+++ b/spec/services/members/authorized_destroy_service_spec.rb
@@ -45,7 +45,7 @@ describe Members::AuthorizedDestroyService do
       expect { described_class.new(member, member_user).execute }
         .to change { number_of_assigned_issuables(member_user) }.from(4).to(2)
 
-      expect(issue.reload.assignee_id).to be_nil
+      expect(issue.reload.assignee_ids).to be_empty
       expect(merge_request.reload.assignee_id).to be_nil
     end
   end