diff --git a/src/NuGetGallery.Core/Entities/PackageOwnerRequest.cs b/src/NuGetGallery.Core/Entities/PackageOwnerRequest.cs
index 7652b9048e..23067e4896 100644
--- a/src/NuGetGallery.Core/Entities/PackageOwnerRequest.cs
+++ b/src/NuGetGallery.Core/Entities/PackageOwnerRequest.cs
@@ -9,10 +9,9 @@ public class PackageOwnerRequest
         : IEntity
     {
         public int PackageRegistrationKey { get; set; }
-        public virtual PackageRegistration PackageRegistration { get; set; }
         public int NewOwnerKey { get; set; }
-        public virtual User NewOwner { get; set; }
-        public virtual User RequestingOwner { get; set; }
+        public User NewOwner { get; set; }
+        public User RequestingOwner { get; set; }
         public int RequestingOwnerKey { get; set; }
         public string ConfirmationCode { get; set; }
         public DateTime RequestDate { get; set; }
diff --git a/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs b/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs
index 1fa9672f1e..0921347fdd 100644
--- a/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs
+++ b/src/NuGetGallery/App_Start/DefaultDependenciesModule.cs
@@ -175,11 +175,6 @@ protected override void Load(ContainerBuilder builder)
                 .AsSelf()
                 .InstancePerLifetimeScope();
 
-            builder.RegisterType<PackageOwnerRequestService>()
-                .AsSelf()
-                .As<IPackageOwnerRequestService>()
-                .InstancePerLifetimeScope();
-
             builder.RegisterType<FormsAuthenticationService>()
                 .As<IFormsAuthenticationService>()
                 .InstancePerLifetimeScope();
diff --git a/src/NuGetGallery/App_Start/Routes.cs b/src/NuGetGallery/App_Start/Routes.cs
index feb53963c7..159ea43c07 100644
--- a/src/NuGetGallery/App_Start/Routes.cs
+++ b/src/NuGetGallery/App_Start/Routes.cs
@@ -147,17 +147,7 @@ public static void RegisterUIRoutes(RouteCollection routes)
             routes.MapRoute(
                 RouteName.PackageOwnerConfirmation,
                 "packages/{id}/owners/{username}/confirm/{token}",
-                new { controller = "Packages", action = "ConfirmPendingOwnershipRequest" });
-
-            routes.MapRoute(
-                RouteName.PackageOwnerRejection,
-                "packages/{id}/owners/{username}/reject/{token}",
-                new { controller = "Packages", action = "RejectPendingOwnershipRequest" });
-
-            routes.MapRoute(
-                RouteName.PackageOwnerCancellation,
-                "packages/{id}/owners/{username}/cancel/{token}",
-                new { controller = "Packages", action = "CancelPendingOwnershipRequest" });
+                new { controller = "Packages", action = "ConfirmOwner" });
 
             // We need the following two routes (rather than just one) due to Routing's
             // Consecutive Optional Parameter bug. :(
diff --git a/src/NuGetGallery/Controllers/AuthenticationController.cs b/src/NuGetGallery/Controllers/AuthenticationController.cs
index 84a8cc0796..5c8590e118 100644
--- a/src/NuGetGallery/Controllers/AuthenticationController.cs
+++ b/src/NuGetGallery/Controllers/AuthenticationController.cs
@@ -255,7 +255,9 @@ public virtual async Task<ActionResult> Register(LogOnViewModel model, string re
             {
                 _messageService.SendNewAccountEmail(
                     new MailAddress(user.User.UnconfirmedEmailAddress, user.User.Username),
-                    Url.ConfirmEmail(
+                    Url.ConfirmationUrl(
+                        "Confirm",
+                        "Users",
                         user.User.Username,
                         user.User.EmailConfirmationToken,
                         relativeUrl: false));
diff --git a/src/NuGetGallery/Controllers/JsonApiController.cs b/src/NuGetGallery/Controllers/JsonApiController.cs
index f5fea3f655..4001cf3528 100644
--- a/src/NuGetGallery/Controllers/JsonApiController.cs
+++ b/src/NuGetGallery/Controllers/JsonApiController.cs
@@ -19,7 +19,7 @@ public partial class JsonApiController
         : AppController
     {
         private readonly IMessageService _messageService;
-        private readonly IPackageOwnerRequestService _packageOwnerRequestService;
+        private readonly IEntityRepository<PackageOwnerRequest> _packageOwnerRequestRepository;
         private readonly IPackageService _packageService;
         private readonly IUserService _userService;
         private readonly IAppConfiguration _appConfiguration;
@@ -28,14 +28,14 @@ public partial class JsonApiController
         public JsonApiController(
             IPackageService packageService,
             IUserService userService,
-            IPackageOwnerRequestService packageOwnerRequestService,
+            IEntityRepository<PackageOwnerRequest> packageOwnerRequestRepository,
             IMessageService messageService,
             IAppConfiguration appConfiguration,
             ISecurityPolicyService policyService)
         {
             _packageService = packageService;
             _userService = userService;
-            _packageOwnerRequestService = packageOwnerRequestService;
+            _packageOwnerRequestRepository = packageOwnerRequestRepository;
             _messageService = messageService;
             _appConfiguration = appConfiguration;
             _policyService = policyService;
@@ -64,15 +64,15 @@ public virtual ActionResult GetPackageOwners(string id, string version)
                                  Pending = false
                              };
 
-            var pending = 
-                _packageOwnerRequestService.GetPackageOwnershipRequests(package: package.PackageRegistration)
-                .Select(r => new
-                {
-                    Name = r.NewOwner.Username,
-                    EmailAddress = r.NewOwner.EmailAddress,
-                    Current = false,
-                    Pending = true
-                });
+            var pending = from u in _packageOwnerRequestRepository.GetAll()
+                          where u.PackageRegistrationKey == package.PackageRegistration.Key
+                          select new
+                              {
+                                  Name = u.NewOwner.Username,
+                                  EmailAddress = u.NewOwner.EmailAddress,
+                                  Current = false,
+                                  Pending = true
+                              };
 
             var result = owners.Union(pending).Select(o => new
             {
@@ -113,27 +113,20 @@ public async Task<JsonResult> AddPackageOwner(string id, string username, string
             if (TryGetManagePackageOwnerModel(id, username, out model))
             {
                 var encodedMessage = HttpUtility.HtmlEncode(message);
-
-                var ownerRequest = await _packageOwnerRequestService.AddPackageOwnershipRequest(
+                var ownerRequest = await _packageService.CreatePackageOwnerRequestAsync(
                     model.Package, model.CurrentUser, model.User);
-
-                var confirmationUrl = Url.ConfirmPendingOwnershipRequest(
-                    model.Package.Id,
-                    model.User.Username,
-                    ownerRequest.ConfirmationCode,
-                    relativeUrl: false);
-
-                var rejectionUrl = Url.RejectPendingOwnershipRequest(
-                    model.Package.Id,
+                var confirmationUrl = Url.ConfirmationUrl(
+                    "ConfirmOwner",
+                    "Packages",
                     model.User.Username,
                     ownerRequest.ConfirmationCode,
+                    new { id = model.Package.Id },
                     relativeUrl: false);
-
                 var packageUrl = Url.Package(model.Package.Id, version: null, relativeUrl: false);
                 var policyMessage = GetNoticeOfPoliciesRequiredMessage(model.Package, model.User, model.CurrentUser);
 
                 _messageService.SendPackageOwnerRequest(model.CurrentUser, model.User, model.Package, packageUrl,
-                    confirmationUrl, rejectionUrl, encodedMessage, policyMessage);
+                    confirmationUrl, encodedMessage, policyMessage);
 
                 return Json(new
                 {
@@ -157,18 +150,9 @@ public async Task<JsonResult> RemovePackageOwner(string id, string username)
             ManagePackageOwnerModel model;
             if (TryGetManagePackageOwnerModel(id, username, out model))
             {
-                var request = _packageOwnerRequestService.GetPackageOwnershipRequests(package: model.Package, newOwner: model.User).FirstOrDefault();
-
                 await _packageService.RemovePackageOwnerAsync(model.Package, model.User);
 
-                if (request == null)
-                {
-                    _messageService.SendPackageOwnerRemovedNotice(model.CurrentUser, model.User, model.Package);
-                }
-                else
-                {
-                    _messageService.SendPackageOwnerRequestCancellationNotice(model.CurrentUser, model.User, model.Package);
-                }
+                _messageService.SendPackageOwnerRemovedNotice(model.CurrentUser, model.User, model.Package);
 
                 return Json(new { success = true });
             }
@@ -257,7 +241,8 @@ private IEnumerable<string> GetPropagatingOwners(PackageRegistration package)
 
         private IEnumerable<string> GetPendingPropagatingOwners(PackageRegistration package)
         {
-            return _packageOwnerRequestService.GetPackageOwnershipRequests(package: package)
+            return _packageOwnerRequestRepository.GetAll()
+                .Where(po => po.PackageRegistrationKey == package.Key)
                 .Select(po => po.NewOwner)
                 .Where(RequireSecurePushForCoOwnersPolicy.IsSubscribed)
                 .Select(po => po.Username);
diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
index f0228b507b..f1a6807564 100644
--- a/src/NuGetGallery/Controllers/PackagesController.cs
+++ b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -44,11 +44,9 @@ public partial class PackagesController
         private readonly IAppConfiguration _config;
         private readonly IMessageService _messageService;
         private readonly IPackageService _packageService;
-        private readonly IPackageOwnerRequestService _packageOwnerRequestService;
         private readonly IPackageFileService _packageFileService;
         private readonly ISearchService _searchService;
         private readonly IUploadFileService _uploadFileService;
-        private readonly IUserService _userService;
         private readonly IEntitiesContext _entitiesContext;
         private readonly IIndexingService _indexingService;
         private readonly ICacheService _cacheService;
@@ -64,9 +62,7 @@ public partial class PackagesController
 
         public PackagesController(
             IPackageService packageService,
-            IPackageOwnerRequestService packageOwnerRequestService,
             IUploadFileService uploadFileService,
-            IUserService userService,
             IMessageService messageService,
             ISearchService searchService,
             IAutomaticallyCuratePackageCommand autoCuratedPackageCmd,
@@ -86,9 +82,7 @@ public PackagesController(
             IReadMeService readMeService)
         {
             _packageService = packageService;
-            _packageOwnerRequestService = packageOwnerRequestService;
             _uploadFileService = uploadFileService;
-            _userService = userService;
             _messageService = messageService;
             _searchService = searchService;
             _autoCuratedPackageCmd = autoCuratedPackageCmd;
@@ -1120,32 +1114,18 @@ public virtual async Task<JsonResult> Edit(string id, string version, VerifyPack
             });
         }
 
-        [HttpGet]
         [Authorize]
         [RequiresAccountConfirmation("accept ownership of a package")]
-        public virtual Task<ActionResult> ConfirmPendingOwnershipRequest(string id, string username, string token)
-        {
-            return HandleOwnershipRequest(id, username, token, accept: true);
-        }
-
-        [HttpGet]
-        [Authorize]
-        [RequiresAccountConfirmation("reject ownership of a package")]
-        public virtual Task<ActionResult> RejectPendingOwnershipRequest(string id, string username, string token)
+        public virtual async Task<ActionResult> ConfirmOwner(string id, string username, string token)
         {
-            return HandleOwnershipRequest(id, username, token, accept: false);
-        }
-
-        private async Task<ActionResult> HandleOwnershipRequest(string id, string username, string token, bool accept)
-        {
-            if (string.IsNullOrEmpty(token))
+            if (String.IsNullOrEmpty(token))
             {
                 return HttpNotFound();
             }
 
-            if (!string.Equals(username, User.Identity.Name, StringComparison.OrdinalIgnoreCase))
+            if (!String.Equals(username, User.Identity.Name, StringComparison.OrdinalIgnoreCase))
             {
-                return View("ConfirmOwner", new PackageOwnerConfirmationModel(id, username, ConfirmOwnershipResult.NotYourRequest));
+                return View(new PackageOwnerConfirmationModel(id, username, ConfirmOwnershipResult.NotYourRequest));
             }
 
             var package = _packageService.FindPackageRegistrationById(id);
@@ -1157,72 +1137,21 @@ private async Task<ActionResult> HandleOwnershipRequest(string id, string userna
             var user = GetCurrentUser();
             if (package.IsOwner(user))
             {
-                return View("ConfirmOwner", new PackageOwnerConfirmationModel(id, username, ConfirmOwnershipResult.AlreadyOwner));
-            }
-
-            var request = _packageOwnerRequestService.GetPackageOwnershipRequest(package, user, token);
-            if (request == null)
-            {
-                return View("ConfirmOwner", new PackageOwnerConfirmationModel(id, username, ConfirmOwnershipResult.Failure));
-            }
-
-            if (accept)
-            {
-                var result = await HandleSecurePushPropagation(package, user);
-
-                await _packageService.AddPackageOwnerAsync(package, user);
-
-                SendAddPackageOwnerNotification(package, user, result.Item1, result.Item2);
-
-                return View("ConfirmOwner", new PackageOwnerConfirmationModel(id, username, ConfirmOwnershipResult.Success));
-            }
-            else
-            {
-                var requestingUser = request.RequestingOwner;
-
-                await _packageService.RemovePackageOwnerAsync(package, user);
-
-                _messageService.SendPackageOwnerRequestRejectionNotice(requestingUser, user, package);
-
-                return View("ConfirmOwner", new PackageOwnerConfirmationModel(id, username, ConfirmOwnershipResult.Rejected));
+                return View(new PackageOwnerConfirmationModel(id, username, ConfirmOwnershipResult.AlreadyOwner));
             }
-        }
 
-        [HttpGet]
-        [Authorize]
-        [RequiresAccountConfirmation("cancel pending ownership request")]
-        public virtual async Task<ActionResult> CancelPendingOwnershipRequest(string id, string requestingUsername, string pendingUsername)
-        {
-            if (!string.Equals(requestingUsername, User.Identity.Name, StringComparison.OrdinalIgnoreCase))
+            if (!_packageService.IsValidPackageOwnerRequest(package, user, token))
             {
-                return View("ConfirmOwner", new PackageOwnerConfirmationModel(id, requestingUsername, ConfirmOwnershipResult.NotYourRequest));
+                return View(new PackageOwnerConfirmationModel(id, username, ConfirmOwnershipResult.Failure));
             }
 
-            var package = _packageService.FindPackageRegistrationById(id);
-            if (package == null)
-            {
-                return HttpNotFound();
-            }
-
-            var requestingUser = GetCurrentUser();
-
-            var pendingUser = _userService.FindByUsername(pendingUsername);
-            if (pendingUser == null)
-            {
-                return HttpNotFound();
-            }
-
-            var request = _packageOwnerRequestService.GetPackageOwnershipRequests(package, requestingUser, pendingUser).FirstOrDefault();
-            if (request == null)
-            {
-                return HttpNotFound();
-            }
+            var result = await HandleSecurePushPropagation(package, user);
 
-            await _packageOwnerRequestService.DeletePackageOwnershipRequest(request);
+            await _packageService.AddPackageOwnerAsync(package, user);
 
-            _messageService.SendPackageOwnerRequestCancellationNotice(requestingUser, pendingUser, package);
+            SendAddPackageOwnerNotification(package, user, result.Item1, result.Item2);
 
-            return View("ConfirmOwner", new PackageOwnerConfirmationModel(id, pendingUsername, ConfirmOwnershipResult.Cancelled));
+            return View(new PackageOwnerConfirmationModel(id, username, ConfirmOwnershipResult.Success));
         }
 
         /// <summary>
diff --git a/src/NuGetGallery/Controllers/UsersController.cs b/src/NuGetGallery/Controllers/UsersController.cs
index 83b06d6976..cf6431c7d5 100644
--- a/src/NuGetGallery/Controllers/UsersController.cs
+++ b/src/NuGetGallery/Controllers/UsersController.cs
@@ -21,7 +21,6 @@ public partial class UsersController
         private readonly IUserService _userService;
         private readonly IMessageService _messageService;
         private readonly IPackageService _packageService;
-        private readonly IPackageOwnerRequestService _packageOwnerRequestService;
         private readonly IAppConfiguration _config;
         private readonly AuthenticationService _authService;
         private readonly ICredentialBuilder _credentialBuilder;
@@ -30,7 +29,6 @@ public UsersController(
             ICuratedFeedService feedsQuery,
             IUserService userService,
             IPackageService packageService,
-            IPackageOwnerRequestService packageOwnerRequestService,
             IMessageService messageService,
             IAppConfiguration config,
             AuthenticationService authService,
@@ -39,7 +37,6 @@ public UsersController(
             _curatedFeedService = feedsQuery ?? throw new ArgumentNullException(nameof(feedsQuery));
             _userService = userService ?? throw new ArgumentNullException(nameof(userService));
             _packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));
-            _packageOwnerRequestService = packageOwnerRequestService ?? throw new ArgumentNullException(nameof(packageOwnerRequestService));
             _messageService = messageService ?? throw new ArgumentNullException(nameof(messageService));
             _config = config ?? throw new ArgumentNullException(nameof(config));
             _authService = authService ?? throw new ArgumentNullException(nameof(authService));
@@ -61,7 +58,8 @@ public virtual ActionResult ConfirmationRequired()
         public virtual ActionResult ConfirmationRequiredPost()
         {
             User user = GetCurrentUser();
-            var confirmationUrl = Url.ConfirmEmail(user.Username, user.EmailConfirmationToken, relativeUrl: false);
+            var confirmationUrl = Url.ConfirmationUrl(
+                "Confirm", "Users", user.Username, user.EmailConfirmationToken, relativeUrl: false);
 
             var alreadyConfirmed = user.UnconfirmedEmailAddress == null;
 
@@ -157,15 +155,9 @@ public virtual ActionResult Packages()
             var packages = _packageService.FindPackagesByOwner(user, includeUnlisted: true)
                 .Select(p => new ListPackageItemViewModel(p)).OrderBy(p => p.Id).ToList();
 
-            var incoming = _packageOwnerRequestService.GetPackageOwnershipRequests(newOwner: user);
-            var outgoing = _packageOwnerRequestService.GetPackageOwnershipRequests(requestingOwner: user);
-
-            var ownerRequests = new OwnerRequestsViewModel(incoming, outgoing, user, _packageService);
-
             var model = new ManagePackagesViewModel
             {
-                Packages = packages,
-                OwnerRequests = ownerRequests
+                Packages = packages
             };
             return View(model);
         }
@@ -397,7 +389,8 @@ public virtual async Task<ActionResult> ChangeEmail(AccountViewModel model)
 
             if (user.Confirmed)
             {
-                var confirmationUrl = Url.ConfirmEmail(user.Username, user.EmailConfirmationToken, relativeUrl: false);
+                var confirmationUrl = Url.ConfirmationUrl(
+                    "Confirm", "Users", user.Username, user.EmailConfirmationToken, relativeUrl: false);
                 _messageService.SendEmailChangeConfirmationNotice(new MailAddress(user.UnconfirmedEmailAddress, user.Username), confirmationUrl);
 
                 TempData["Message"] = Strings.EmailUpdated_ConfirmationRequired;
@@ -758,10 +751,12 @@ private static int CountLoginCredentials(User user)
 
         private ActionResult SendPasswordResetEmail(User user, bool forgotPassword)
         {
-            var resetPasswordUrl = Url.ResetEmailOrPassword(
+            var resetPasswordUrl = Url.ConfirmationUrl(
+                "ResetPassword",
+                "Users",
                 user.Username,
                 user.PasswordResetToken,
-                forgotPassword,
+                new { forgot = forgotPassword },
                 relativeUrl: false);
             _messageService.SendPasswordResetInstructions(user, resetPasswordUrl, forgotPassword);
 
diff --git a/src/NuGetGallery/Migrations/201709202249402_AddPackageOwnershipRequestsPage.Designer.cs b/src/NuGetGallery/Migrations/201709202249402_AddPackageOwnershipRequestsPage.Designer.cs
deleted file mode 100644
index 5bd5129d5f..0000000000
--- a/src/NuGetGallery/Migrations/201709202249402_AddPackageOwnershipRequestsPage.Designer.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace NuGetGallery.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")]
-    public sealed partial class AddPackageOwnershipRequestsPage : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddPackageOwnershipRequestsPage));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "201709202249402_AddPackageOwnershipRequestsPage"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}
diff --git a/src/NuGetGallery/Migrations/201709202249402_AddPackageOwnershipRequestsPage.cs b/src/NuGetGallery/Migrations/201709202249402_AddPackageOwnershipRequestsPage.cs
deleted file mode 100644
index b01a54aa10..0000000000
--- a/src/NuGetGallery/Migrations/201709202249402_AddPackageOwnershipRequestsPage.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace NuGetGallery.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class AddPackageOwnershipRequestsPage : DbMigration
-    {
-        public override void Up()
-        {
-            CreateIndex("dbo.PackageOwnerRequests", "PackageRegistrationKey");
-            AddForeignKey("dbo.PackageOwnerRequests", "PackageRegistrationKey", "dbo.PackageRegistrations", "Key", cascadeDelete: true);
-        }
-        
-        public override void Down()
-        {
-            DropForeignKey("dbo.PackageOwnerRequests", "PackageRegistrationKey", "dbo.PackageRegistrations");
-            DropIndex("dbo.PackageOwnerRequests", new[] { "PackageRegistrationKey" });
-        }
-    }
-}
diff --git a/src/NuGetGallery/Migrations/201709202249402_AddPackageOwnershipRequestsPage.resx b/src/NuGetGallery/Migrations/201709202249402_AddPackageOwnershipRequestsPage.resx
deleted file mode 100644
index 5583429cf0..0000000000
--- a/src/NuGetGallery/Migrations/201709202249402_AddPackageOwnershipRequestsPage.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Target" xml:space="preserve">
-    <value>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</value>
-  </data>
-  <data name="DefaultSchema" xml:space="preserve">
-    <value>dbo</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/NuGetGallery/NuGetGallery.csproj b/src/NuGetGallery/NuGetGallery.csproj
index 40c15dc526..428503152a 100644
--- a/src/NuGetGallery/NuGetGallery.csproj
+++ b/src/NuGetGallery/NuGetGallery.csproj
@@ -804,10 +804,6 @@
     <Compile Include="Migrations\201709111714021_AddPackageStatusKey.Designer.cs">
       <DependentUpon>201709111714021_AddPackageStatusKey.cs</DependentUpon>
     </Compile>
-    <Compile Include="Migrations\201709202249402_AddPackageOwnershipRequestsPage.cs" />
-    <Compile Include="Migrations\201709202249402_AddPackageOwnershipRequestsPage.Designer.cs">
-      <DependentUpon>201709202249402_AddPackageOwnershipRequestsPage.cs</DependentUpon>
-    </Compile>
     <Compile Include="RequestModels\ReadMeRequest.cs" />
     <Compile Include="Security\RequireSecurePushForCoOwnersPolicy.cs" />
     <Compile Include="Security\SecurePushSubscription.cs" />
@@ -825,9 +821,7 @@
     <Compile Include="Security\UserSecurityPolicyEvaluationContext.cs" />
     <Compile Include="Security\SecurityPolicyResult.cs" />
     <Compile Include="Security\UserSecurityPolicySubscriptionContext.cs" />
-    <Compile Include="Services\IPackageOwnerRequestService.cs" />
     <Compile Include="Services\IReadMeService.cs" />
-    <Compile Include="Services\PackageOwnerRequestService.cs" />
     <Compile Include="Services\PackageUploadService.cs" />
     <Compile Include="Services\IReservedNamespaceService.cs" />
     <Compile Include="Services\IPackageUploadService.cs" />
@@ -1528,9 +1522,6 @@
     <Compile Include="ViewModels\ManagePackagesListViewModel.cs" />
     <Compile Include="ViewModels\ApiKeyListViewModel.cs" />
     <Compile Include="ViewModels\ApiKeyViewModel.cs" />
-    <Compile Include="ViewModels\OwnerRequestsListItemViewModel.cs" />
-    <Compile Include="ViewModels\OwnerRequestsListViewModel.cs" />
-    <Compile Include="ViewModels\OwnerRequestsViewModel.cs" />
     <Compile Include="ViewModels\PackageHeadingModel.cs" />
     <Compile Include="ViewModels\PackageManagerViewModel.cs" />
     <Compile Include="ViewModels\ReportMyPackageViewModel.cs" />
@@ -1824,9 +1815,6 @@
     <EmbeddedResource Include="Migrations\201709111714021_AddPackageStatusKey.resx">
       <DependentUpon>201709111714021_AddPackageStatusKey.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201709202249402_AddPackageOwnershipRequestsPage.resx">
-      <DependentUpon>201709202249402_AddPackageOwnershipRequestsPage.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="OData\QueryAllowed\Data\apiv1packages.json" />
     <EmbeddedResource Include="OData\QueryAllowed\Data\apiv1search.json" />
     <EmbeddedResource Include="OData\QueryAllowed\Data\apiv2getupdates.json" />
@@ -1884,8 +1872,6 @@
     <Content Include="Views\Packages\_ImportReadMe.cshtml" />
     <Content Include="Views\Packages\_SubmitPackage.cshtml" />
     <Content Include="Views\Packages\_EditForm.cshtml" />
-    <Content Include="Views\Users\OwnerRequests.cshtml" />
-    <Content Include="Views\Users\_OwnerRequestsList.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDictionary Include="Properties\CodeAnalysisDictionary.xml" />
diff --git a/src/NuGetGallery/RouteNames.cs b/src/NuGetGallery/RouteNames.cs
index 24b76319a1..e73ffccbb3 100644
--- a/src/NuGetGallery/RouteNames.cs
+++ b/src/NuGetGallery/RouteNames.cs
@@ -22,12 +22,11 @@ public static class RouteName
         public const string Authentication = "SignIn";
         public const string UploadPackage = "UploadPackage";
         public const string UploadPackageProgress = "UploadPackageProgress";
+        public const string ManagePackageOwners = "ManagePackageOwners";
         public const string PackageVersionAction = "PackageVersionAction";
         public const string PackageFilePathAction = "PackageFilePathAction";
         public const string PackageFileContentsAction = "PackageFileContentsAction";
         public const string PackageOwnerConfirmation = "PackageOwnerConfirmation";
-        public const string PackageOwnerRejection = "PackageOwnerRejection";
-        public const string PackageOwnerCancellation = "PackageOwnerCancellation";
         public const string PackageAction = "PackageAction";
         public const string PushPackageApi = "PushPackageApi";
         public const string PublishPackageApi = "PublishPackageApi";
diff --git a/src/NuGetGallery/Scripts/gallery/page-manage-packages.js b/src/NuGetGallery/Scripts/gallery/page-manage-packages.js
index 0f75fa69f7..29a6d02177 100644
--- a/src/NuGetGallery/Scripts/gallery/page-manage-packages.js
+++ b/src/NuGetGallery/Scripts/gallery/page-manage-packages.js
@@ -1,9 +1,16 @@
 $(function () {
     'use strict';
 
-    window.nuget.configureExpanderHeading("packages-Published");
-    window.nuget.configureExpanderHeading("packages-Unlisted");
-
-    window.nuget.configureExpanderHeading("requests-Incoming");
-    window.nuget.configureExpanderHeading("requests-Outgoing");
+    window.nuget.configureExpander(
+        "packages-Published",
+        "ChevronRight",
+        "My Published Packages",
+        "ChevronDown",
+        "My Published Packages");
+    window.nuget.configureExpander(
+        "packages-Unlisted",
+        "ChevronRight",
+        "My Unlisted Packages",
+        "ChevronDown",
+        "My Unlisted Packages");
 });
diff --git a/src/NuGetGallery/Services/ConfirmOwnershipResult.cs b/src/NuGetGallery/Services/ConfirmOwnershipResult.cs
index 3e7e984cf2..ee649511ed 100644
--- a/src/NuGetGallery/Services/ConfirmOwnershipResult.cs
+++ b/src/NuGetGallery/Services/ConfirmOwnershipResult.cs
@@ -8,8 +8,6 @@ public enum ConfirmOwnershipResult
         Success,
         Failure,
         NotYourRequest,
-        AlreadyOwner,
-        Rejected,
-        Cancelled
+        AlreadyOwner
     }
 }
diff --git a/src/NuGetGallery/Services/IMessageService.cs b/src/NuGetGallery/Services/IMessageService.cs
index 982fe641e3..fb662a2b3d 100644
--- a/src/NuGetGallery/Services/IMessageService.cs
+++ b/src/NuGetGallery/Services/IMessageService.cs
@@ -15,9 +15,7 @@ public interface IMessageService
         void SendEmailChangeConfirmationNotice(MailAddress newEmailAddress, string confirmationUrl);
         void SendPasswordResetInstructions(User user, string resetPasswordUrl, bool forgotPassword);
         void SendEmailChangeNoticeToPreviousEmailAddress(User user, string oldEmailAddress);
-        void SendPackageOwnerRequest(User fromUser, User toUser, PackageRegistration package, string packageUrl, string confirmationUrl, string rejectionUrl, string message, string policyMessage);
-        void SendPackageOwnerRequestRejectionNotice(User requestingOwner, User newOwner, PackageRegistration package);
-        void SendPackageOwnerRequestCancellationNotice(User requestingOwner, User newOwner, PackageRegistration package);
+        void SendPackageOwnerRequest(User fromUser, User toUser, PackageRegistration package, string packageUrl, string confirmationUrl, string message, string policyMessage);
         void SendPackageOwnerAddedNotice(User toUser, User newOwner, PackageRegistration package, string packageUrl, string policyMessage);
         void SendPackageOwnerRemovedNotice(User fromUser, User toUser, PackageRegistration package);
         void SendCredentialRemovedNotice(User user, Credential removed);
diff --git a/src/NuGetGallery/Services/IPackageOwnerRequestService.cs b/src/NuGetGallery/Services/IPackageOwnerRequestService.cs
deleted file mode 100644
index ecf67579dd..0000000000
--- a/src/NuGetGallery/Services/IPackageOwnerRequestService.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace NuGetGallery
-{
-    public interface IPackageOwnerRequestService
-    {
-        /// <summary>
-        /// Gets <see cref="PackageOwnerRequest"/>s that match the provided conditions.
-        /// </summary>
-        /// <param name="package">If nonnull, only returns <see cref="PackageOwnerRequest"/>s that are for this package.</param>
-        /// <param name="requestingOwner">If nonnull, only returns <see cref="PackageOwnerRequest"/>s that were requested by this owner.</param>
-        /// <param name="newOwner">If nonnull, only returns <see cref="PackageOwnerRequest"/>s that are for this user to become an owner.</param>
-        /// <returns>An <see cref="IEnumerable{PackageOwnerRequest}"/> containing all objects that matched the conditions.</returns>
-        IEnumerable<PackageOwnerRequest> GetPackageOwnershipRequests(PackageRegistration package = null, User requestingOwner = null, User newOwner = null);
-
-        /// <summary>
-        /// Checks if the pending owner has a request for this package which matches the specified token.
-        /// </summary>
-        /// <param name="package">Package associated with the request.</param>
-        /// <param name="pendingOwner">Pending owner for the request.</param>
-        /// <param name="token">Token generated for the owner request.</param>
-        /// <returns>The <see cref="PackageOwnerRequest"/> if one exists or null otherwise.</returns>
-        PackageOwnerRequest GetPackageOwnershipRequest(PackageRegistration package, User pendingOwner, string token);
-
-        /// <summary>
-        /// Creates a <see cref="PackageOwnerRequest"/> with the given parameters.
-        /// </summary>
-        /// <param name="package">The package that the <see cref="PackageOwnerRequest"/> will pertain to.</param>
-        /// <param name="requestingOwner">The owner creating this <see cref="PackageOwnerRequest"/>.</param>
-        /// <param name="newOwner">The user to be added as an owner by this <see cref="PackageOwnerRequest"/>.</param>
-        /// <returns>A <see cref="PackageOwnerRequest"/> with the given parameters.</returns>
-        Task<PackageOwnerRequest> AddPackageOwnershipRequest(PackageRegistration package, User requestingOwner, User newOwner);
-
-        /// <summary>
-        /// Deletes the provided <see cref="PackageOwnerRequest"/>.
-        /// </summary>
-        /// <param name="request">The <see cref="PackageOwnerRequest"/> to delete.</param>
-        Task DeletePackageOwnershipRequest(PackageOwnerRequest request);
-    }
-}
diff --git a/src/NuGetGallery/Services/IPackageService.cs b/src/NuGetGallery/Services/IPackageService.cs
index 710ca4a23c..d4906afdb2 100644
--- a/src/NuGetGallery/Services/IPackageService.cs
+++ b/src/NuGetGallery/Services/IPackageService.cs
@@ -59,6 +59,17 @@ public interface IPackageService
         Task MarkPackageUnlistedAsync(Package package, bool commitChanges = true);
         Task MarkPackageListedAsync(Package package, bool commitChanges = true);
 
+        Task<PackageOwnerRequest> CreatePackageOwnerRequestAsync(PackageRegistration package, User currentOwner, User newOwner);
+        
+        /// <summary>
+        /// Checks if the pending owner has a request for this package which matches the specified token.
+        /// </summary>
+        /// <param name="package">Package associated with the request.</param>
+        /// <param name="pendingOwner">Pending owner for the request.</param>
+        /// <param name="token">Token generated for the owner request.</param>
+        /// <returns>True if valid, false otherwise.</returns>
+        bool IsValidPackageOwnerRequest(PackageRegistration package, User pendingOwner, string token);
+
         /// <summary>
         /// Performs database changes to add a new package owner while removing the corresponding package owner request.
         /// </summary>
diff --git a/src/NuGetGallery/Services/MessageService.cs b/src/NuGetGallery/Services/MessageService.cs
index 15de439b35..51df153e63 100644
--- a/src/NuGetGallery/Services/MessageService.cs
+++ b/src/NuGetGallery/Services/MessageService.cs
@@ -285,7 +285,7 @@ public void SendPasswordResetInstructions(User user, string resetPasswordUrl, bo
             }
         }
 
-        public void SendPackageOwnerRequest(User fromUser, User toUser, PackageRegistration package, string packageUrl, string confirmationUrl, string rejectionUrl, string message, string policyMessage)
+        public void SendPackageOwnerRequest(User fromUser, User toUser, PackageRegistration package, string packageUrl, string confirmationUrl, string message, string policyMessage)
         {
             if (!toUser.EmailAllowed)
             {
@@ -300,16 +300,13 @@ public void SendPackageOwnerRequest(User fromUser, User toUser, PackageRegistrat
             const string subject = "[{0}] The user '{1}' would like to add you as an owner of the package '{2}'.";
 
             string body = string.Format(CultureInfo.CurrentCulture, $@"The user '{fromUser.Username}' wants to add you as an owner of the package '{package.Id}'.
+If you do not want to be listed as an owner of this package, simply delete this email.
 
 Package URL on NuGet.org: [{packageUrl}]({packageUrl})
 {policyMessage}
 To accept this request and become a listed owner of the package, click the following URL:
 
-[{confirmationUrl}]({confirmationUrl})
-
-If you do not want to be listed as an owner of this package, click the following URL:
-
-[{rejectionUrl}]({rejectionUrl})");
+[{confirmationUrl}]({confirmationUrl})");
 
             if (!string.IsNullOrWhiteSpace(message))
             {
@@ -333,58 +330,6 @@ public void SendPackageOwnerRequest(User fromUser, User toUser, PackageRegistrat
             }
         }
 
-        public void SendPackageOwnerRequestRejectionNotice(User requestingOwner, User newOwner, PackageRegistration package)
-        {
-            if (!requestingOwner.EmailAllowed)
-            {
-                return;
-            }
-
-            var subject = string.Format(CultureInfo.CurrentCulture, $"[{Config.GalleryOwner.DisplayName}] The user '{newOwner.Username}' has rejected your request to add them as an owner of the package '{package.Id}'.");
-
-            var body = string.Format(CultureInfo.CurrentCulture, $@"The user '{newOwner.Username}' has rejected your request to add them as an owner of the package '{package.Id}'.
-
-Thanks,
-The {Config.GalleryOwner.DisplayName} Team");
-
-            using (var mailMessage = new MailMessage())
-            {
-                mailMessage.Subject = subject;
-                mailMessage.Body = body;
-                mailMessage.From = Config.GalleryNoReplyAddress;
-                mailMessage.ReplyToList.Add(newOwner.ToMailAddress());
-
-                mailMessage.To.Add(requestingOwner.ToMailAddress());
-                SendMessage(mailMessage);
-            }
-        }
-
-        public void SendPackageOwnerRequestCancellationNotice(User requestingOwner, User newOwner, PackageRegistration package)
-        {
-            if (!newOwner.EmailAllowed)
-            {
-                return;
-            }
-
-            var subject = string.Format(CultureInfo.CurrentCulture, $"[{Config.GalleryOwner.DisplayName}] The user '{requestingOwner.Username}' has cancelled their request for you to be added as an owner of the package '{package.Id}'.");
-
-            var body = string.Format(CultureInfo.CurrentCulture, $@"The user '{requestingOwner.Username}' has cancelled their request for you to be added as an owner of the package '{package.Id}'.
-
-Thanks,
-The {Config.GalleryOwner.DisplayName} Team");
-
-            using (var mailMessage = new MailMessage())
-            {
-                mailMessage.Subject = subject;
-                mailMessage.Body = body;
-                mailMessage.From = Config.GalleryNoReplyAddress;
-                mailMessage.ReplyToList.Add(requestingOwner.ToMailAddress());
-
-                mailMessage.To.Add(newOwner.ToMailAddress());
-                SendMessage(mailMessage);
-            }
-        }
-
         public void SendPackageOwnerAddedNotice(User toUser, User newOwner, PackageRegistration package, string packageUrl, string policyMessage)
         {
             if (!toUser.EmailAllowed)
diff --git a/src/NuGetGallery/Services/PackageOwnerRequestService.cs b/src/NuGetGallery/Services/PackageOwnerRequestService.cs
deleted file mode 100644
index 5fd996fffc..0000000000
--- a/src/NuGetGallery/Services/PackageOwnerRequestService.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace NuGetGallery
-{
-    public class PackageOwnerRequestService : IPackageOwnerRequestService
-    {
-        private readonly IEntityRepository<PackageOwnerRequest> _packageOwnerRequestRepository;
-
-        public PackageOwnerRequestService(IEntityRepository<PackageOwnerRequest> packageOwnerRequestRepository)
-        {
-            _packageOwnerRequestRepository = packageOwnerRequestRepository ?? throw new ArgumentNullException(nameof(packageOwnerRequestRepository));
-        }
-
-        public PackageOwnerRequest GetPackageOwnershipRequest(PackageRegistration package, User newOwner, string token)
-        {
-            if (package == null)
-            {
-                throw new ArgumentNullException(nameof(package));
-            }
-
-            if (newOwner == null)
-            {
-                throw new ArgumentNullException(nameof(newOwner));
-            }
-
-            if (String.IsNullOrEmpty(token))
-            {
-                throw new ArgumentNullException(nameof(token));
-            }
-
-            var request = GetPackageOwnershipRequests(package: package, newOwner: newOwner).FirstOrDefault();
-            if (request == null)
-            {
-                return null;
-            }
-
-            return request.ConfirmationCode == token ? request : null;
-        }
-
-        public IEnumerable<PackageOwnerRequest> GetPackageOwnershipRequests(PackageRegistration package = null, User requestingOwner = null, User newOwner = null)
-        {
-            var query = _packageOwnerRequestRepository.GetAll();
-
-            if (package != null)
-            {
-                query = query.Where(r => r.PackageRegistrationKey == package.Key);
-            }
-
-            if (requestingOwner != null)
-            {
-                query = query.Where(r => r.RequestingOwnerKey == requestingOwner.Key);
-            }
-
-            if (newOwner != null)
-            {
-                query = query.Where(r => r.NewOwnerKey == newOwner.Key);
-            }
-
-            return query.ToArray();
-        }
-
-        public async Task<PackageOwnerRequest> AddPackageOwnershipRequest(PackageRegistration package, User requestingOwner, User newOwner)
-        {
-            var existingRequest = GetPackageOwnershipRequests(package: package, newOwner: newOwner).FirstOrDefault();
-            if (existingRequest != null)
-            {
-                return existingRequest;
-            }
-
-            var newRequest = new PackageOwnerRequest
-            {
-                PackageRegistrationKey = package.Key,
-                RequestingOwnerKey = requestingOwner.Key,
-                NewOwnerKey = newOwner.Key,
-                ConfirmationCode = CryptographyService.GenerateToken(),
-                RequestDate = DateTime.UtcNow
-            };
-
-            _packageOwnerRequestRepository.InsertOnCommit(newRequest);
-            await _packageOwnerRequestRepository.CommitChangesAsync();
-            return newRequest;
-        }
-
-        public async Task DeletePackageOwnershipRequest(PackageOwnerRequest request)
-        {
-            _packageOwnerRequestRepository.DeleteOnCommit(request);
-            await _packageOwnerRequestRepository.CommitChangesAsync();
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/src/NuGetGallery/Services/PackageService.cs b/src/NuGetGallery/Services/PackageService.cs
index 23c57945b2..34545ab1e6 100644
--- a/src/NuGetGallery/Services/PackageService.cs
+++ b/src/NuGetGallery/Services/PackageService.cs
@@ -18,16 +18,16 @@ namespace NuGetGallery
     public class PackageService : IPackageService
     {
         private readonly IIndexingService _indexingService;
+        private readonly IEntityRepository<PackageOwnerRequest> _packageOwnerRequestRepository;
         private readonly IEntityRepository<PackageRegistration> _packageRegistrationRepository;
         private readonly IEntityRepository<Package> _packageRepository;
-        private readonly IPackageOwnerRequestService _packageOwnerRequestService;
         private readonly IPackageNamingConflictValidator _packageNamingConflictValidator;
         private readonly IAuditingService _auditingService;
 
         public PackageService(
             IEntityRepository<PackageRegistration> packageRegistrationRepository,
             IEntityRepository<Package> packageRepository,
-            IPackageOwnerRequestService packageOwnerRequestService,
+            IEntityRepository<PackageOwnerRequest> packageOwnerRequestRepository,
             IIndexingService indexingService,
             IPackageNamingConflictValidator packageNamingConflictValidator,
             IAuditingService auditingService)
@@ -42,9 +42,9 @@ public PackageService(
                 throw new ArgumentNullException(nameof(packageRepository));
             }
 
-            if (packageOwnerRequestService == null)
+            if (packageOwnerRequestRepository == null)
             {
-                throw new ArgumentNullException(nameof(packageOwnerRequestService));
+                throw new ArgumentNullException(nameof(packageOwnerRequestRepository));
             }
 
             if (indexingService == null)
@@ -64,7 +64,7 @@ public PackageService(
 
             _packageRegistrationRepository = packageRegistrationRepository;
             _packageRepository = packageRepository;
-            _packageOwnerRequestService = packageOwnerRequestService;
+            _packageOwnerRequestRepository = packageOwnerRequestRepository;
             _indexingService = indexingService;
             _packageNamingConflictValidator = packageNamingConflictValidator;
             _auditingService = auditingService;
@@ -425,10 +425,11 @@ public async Task AddPackageOwnerAsync(PackageRegistration package, User newOwne
             package.Owners.Add(newOwner);
             await _packageRepository.CommitChangesAsync();
 
-            var request = _packageOwnerRequestService.GetPackageOwnershipRequests(package: package, newOwner: newOwner).FirstOrDefault();
+            var request = FindExistingPackageOwnerRequest(package, newOwner);
             if (request != null)
             {
-                await _packageOwnerRequestService.DeletePackageOwnershipRequest(request);
+                _packageOwnerRequestRepository.DeleteOnCommit(request);
+                await _packageOwnerRequestRepository.CommitChangesAsync();
             }
 
             await _auditingService.SaveAuditRecordAsync(
@@ -442,10 +443,11 @@ public async Task RemovePackageOwnerAsync(PackageRegistration package, User user
                 throw new InvalidOperationException("You can't remove the only owner from a package.");
             }
 
-            var request = _packageOwnerRequestService.GetPackageOwnershipRequests(package: package, newOwner: user).FirstOrDefault();
-            if (request != null)
+            var pendingOwner = FindExistingPackageOwnerRequest(package, user);
+            if (pendingOwner != null)
             {
-                await _packageOwnerRequestService.DeletePackageOwnershipRequest(request);
+                _packageOwnerRequestRepository.DeleteOnCommit(pendingOwner);
+                await _packageOwnerRequestRepository.CommitChangesAsync();
                 return;
             }
 
@@ -521,6 +523,49 @@ public async Task MarkPackageUnlistedAsync(Package package, bool commitChanges =
             }
         }
 
+        public async Task<PackageOwnerRequest> CreatePackageOwnerRequestAsync(PackageRegistration package, User currentOwner, User newOwner)
+        {
+            var existingRequest = FindExistingPackageOwnerRequest(package, newOwner);
+            if (existingRequest != null)
+            {
+                return existingRequest;
+            }
+
+            var newRequest = new PackageOwnerRequest
+            {
+                PackageRegistrationKey = package.Key,
+                RequestingOwnerKey = currentOwner.Key,
+                NewOwnerKey = newOwner.Key,
+                ConfirmationCode = CryptographyService.GenerateToken(),
+                RequestDate = DateTime.UtcNow
+            };
+
+            _packageOwnerRequestRepository.InsertOnCommit(newRequest);
+            await _packageOwnerRequestRepository.CommitChangesAsync();
+            return newRequest;
+        }
+
+        public bool IsValidPackageOwnerRequest(PackageRegistration package, User pendingOwner, string token)
+        {
+            if (package == null)
+            {
+                throw new ArgumentNullException(nameof(package));
+            }
+
+            if (pendingOwner == null)
+            {
+                throw new ArgumentNullException(nameof(pendingOwner));
+            }
+
+            if (String.IsNullOrEmpty(token))
+            {
+                throw new ArgumentNullException(nameof(token));
+            }
+
+            var request = FindExistingPackageOwnerRequest(package, pendingOwner);
+            return (request != null && request.ConfirmationCode == token);
+        }
+
         private IQueryable<Package> GetPackagesByIdQueryable(string id)
         {
             return _packageRepository.GetAll()
@@ -872,6 +917,13 @@ private static Package FindPackage(IEnumerable<Package> packages, Func<Package,
             return packages.First(pv => pv.Version.Equals(version.OriginalVersion, StringComparison.OrdinalIgnoreCase));
         }
 
+        private PackageOwnerRequest FindExistingPackageOwnerRequest(PackageRegistration package, User pendingOwner)
+        {
+            return (from request in _packageOwnerRequestRepository.GetAll()
+                    where request.PackageRegistrationKey == package.Key && request.NewOwnerKey == pendingOwner.Key
+                    select request).FirstOrDefault();
+        }
+
         private void NotifyIndexingService()
         {
             _indexingService.UpdateIndex();
diff --git a/src/NuGetGallery/UrlExtensions.cs b/src/NuGetGallery/UrlExtensions.cs
index 15e2214b71..d936a28363 100644
--- a/src/NuGetGallery/UrlExtensions.cs
+++ b/src/NuGetGallery/UrlExtensions.cs
@@ -612,87 +612,31 @@ public static string RemovePackageOwner(this UrlHelper url, bool relativeUrl = t
             return GetActionLink(url, "RemovePackageOwner", "JsonApi", relativeUrl);
         }
 
-        public static string ConfirmPendingOwnershipRequest(
-            this UrlHelper url,
-            string packageId,
-            string username,
-            string confirmationCode,
-            bool relativeUrl = true)
-        {
-            var routeValues = new RouteValueDictionary
-            {
-                ["id"] = packageId,
-                ["username"] = username,
-                ["token"] = confirmationCode
-            };
-
-            return GetActionLink(url, "ConfirmPendingOwnershipRequest", "Packages", relativeUrl, routeValues);
-        }
-
-        public static string RejectPendingOwnershipRequest(
-            this UrlHelper url,
-            string packageId,
-            string username,
-            string confirmationCode,
-            bool relativeUrl = true)
-        {
-            var routeValues = new RouteValueDictionary
-            {
-                ["id"] = packageId,
-                ["username"] = username,
-                ["token"] = confirmationCode
-            };
-
-            return GetActionLink(url, "RejectPendingOwnershipRequest", "Packages", relativeUrl, routeValues);
-        }
-
-        public static string CancelPendingOwnershipRequest(
-            this UrlHelper url,
-            string packageId,
-            string requestingUsername,
-            string pendingUsername,
-            bool relativeUrl = true)
-        {
-            var routeValues = new RouteValueDictionary
-            {
-                ["id"] = packageId,
-                ["requestingUsername"] = requestingUsername,
-                ["pendingUsername"] = pendingUsername
-            };
-
-            return GetActionLink(url, "CancelPendingOwnershipRequest", "Packages", relativeUrl, routeValues);
-        }
-
-        public static string ConfirmEmail(
+        public static string ConfirmationUrl(
             this UrlHelper url,
+            string action,
+            string controller,
             string username,
             string token,
             bool relativeUrl = true)
         {
-            var routeValues = new RouteValueDictionary
-            {
-                ["username"] = username,
-                ["token"] = token
-            };
-
-            return GetActionLink(url, "Confirm", "Users", relativeUrl, routeValues);
+            return ConfirmationUrl(url, action, controller, username, token, routeValues: null, relativeUrl: relativeUrl);
         }
 
-        public static string ResetEmailOrPassword(
+        public static string ConfirmationUrl(
             this UrlHelper url,
+            string action,
+            string controller,
             string username,
             string token,
-            bool forgotPassword,
+            object routeValues,
             bool relativeUrl = true)
         {
-            var routeValues = new RouteValueDictionary
-            {
-                ["username"] = username,
-                ["token"] = token,
-                ["forgot"] = forgotPassword
-            };
+            var rvd = routeValues == null ? new RouteValueDictionary() : new RouteValueDictionary(routeValues);
+            rvd["username"] = username;
+            rvd["token"] = token;
 
-            return GetActionLink(url, "ResetPassword", "Users", relativeUrl, routeValues);
+            return GetActionLink(url, action, controller, relativeUrl, rvd);
         }
 
         public static string VerifyPackage(this UrlHelper url, bool relativeUrl = true)
diff --git a/src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs b/src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs
index 8ab5a563f9..bc79a545c9 100644
--- a/src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs
+++ b/src/NuGetGallery/ViewModels/ManagePackagesViewModel.cs
@@ -1,6 +1,5 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
 using System.Collections.Generic;
 
 namespace NuGetGallery
@@ -8,7 +7,5 @@ namespace NuGetGallery
     public class ManagePackagesViewModel
     {
         public IEnumerable<ListPackageItemViewModel> Packages { get; set; }
-
-        public OwnerRequestsViewModel OwnerRequests { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/NuGetGallery/ViewModels/OwnerRequestsListItemViewModel.cs b/src/NuGetGallery/ViewModels/OwnerRequestsListItemViewModel.cs
deleted file mode 100644
index 0ba6842bd4..0000000000
--- a/src/NuGetGallery/ViewModels/OwnerRequestsListItemViewModel.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-
-namespace NuGetGallery
-{
-    public class OwnerRequestsListItemViewModel
-    {
-        public PackageOwnerRequest Request { get; }
-
-        public Package Package { get; }
-        
-        public OwnerRequestsListItemViewModel(PackageOwnerRequest request, IPackageService packageService)
-        {
-            Request = request;
-            Package = packageService.FindPackageByIdAndVersion(request.PackageRegistration.Id, version: null, semVerLevelKey: SemVerLevelKey.SemVer2, allowPrerelease: true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/NuGetGallery/ViewModels/OwnerRequestsListViewModel.cs b/src/NuGetGallery/ViewModels/OwnerRequestsListViewModel.cs
deleted file mode 100644
index ec990999ed..0000000000
--- a/src/NuGetGallery/ViewModels/OwnerRequestsListViewModel.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-
-namespace NuGetGallery
-{
-    public class OwnerRequestsListViewModel
-    {
-        public IEnumerable<OwnerRequestsListItemViewModel> RequestItems { get; }
-
-        public string Name { get; }
-
-        public User CurrentUser { get; }
-        
-        public OwnerRequestsListViewModel(IEnumerable<PackageOwnerRequest> requests, string name, User currentUser, IPackageService packageService)
-        {
-            RequestItems = requests.Select(r => new OwnerRequestsListItemViewModel(r, packageService)).ToArray();
-            Name = name;
-            CurrentUser = currentUser;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/NuGetGallery/ViewModels/OwnerRequestsViewModel.cs b/src/NuGetGallery/ViewModels/OwnerRequestsViewModel.cs
deleted file mode 100644
index d6bf16231c..0000000000
--- a/src/NuGetGallery/ViewModels/OwnerRequestsViewModel.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-
-namespace NuGetGallery
-{
-    public class OwnerRequestsViewModel
-    {
-        /// <summary>
-        /// A model to show the requests for this user to become an owner of a package.
-        /// </summary>
-        public OwnerRequestsListViewModel Incoming { get; }
-
-        /// <summary>
-        /// A model to show the requests this user has sent to other users to become owners.
-        /// </summary>
-        public OwnerRequestsListViewModel Outgoing { get; }
-
-        public OwnerRequestsViewModel(IEnumerable<PackageOwnerRequest> incoming, IEnumerable<PackageOwnerRequest> outgoing, User currentUser, IPackageService packageService)
-        {
-            Incoming = new OwnerRequestsListViewModel(incoming, nameof(Incoming), currentUser, packageService);
-            Outgoing = new OwnerRequestsListViewModel(outgoing, nameof(Outgoing), currentUser, packageService);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/NuGetGallery/Views/Packages/ConfirmOwner.cshtml b/src/NuGetGallery/Views/Packages/ConfirmOwner.cshtml
index 48697707e7..b43cf648b5 100644
--- a/src/NuGetGallery/Views/Packages/ConfirmOwner.cshtml
+++ b/src/NuGetGallery/Views/Packages/ConfirmOwner.cshtml
@@ -9,87 +9,61 @@
 <section role="main" class="container main-container page-manage-owners">
     <div class="col-xs-12">
         <h1 class="text-center">
-            @switch (Model.Result)
+            @if (Model.Result == ConfirmOwnershipResult.Success
+                || Model.Result == ConfirmOwnershipResult.AlreadyOwner)
             {
-                case ConfirmOwnershipResult.Success:
-                case ConfirmOwnershipResult.AlreadyOwner:
-                    @:Ownership Confirmed
-                    break;
-
-                case ConfirmOwnershipResult.Rejected:
-                    @:Ownership Rejected
-                    break;
-
-                case ConfirmOwnershipResult.Cancelled:
-                    @:Ownership Request Cancelled
-                    break;
-
-                default:
-                    @:Ownership Confirmation Failed
-                    break;
+                @:Email Confirmed
+            }
+            else
+            {
+                @:Email Confirmation Failed
             }
         </h1>
     </div>
     <div class="@ViewHelpers.GetColumnClasses(ViewBag)">
-        @switch (Model.Result)
+        @if (Model.Result == ConfirmOwnershipResult.Success)
         {
-            case ConfirmOwnershipResult.Success:
-                <p class="text-center">
-                    You are now an owner of the
-                    '<strong><a href="@Url.Package(@Model.PackageId)" title="The @Model.PackageId package">@Model.PackageId</a></strong>' package!
-                </p>
-                break;
-
-            case ConfirmOwnershipResult.Rejected:
-                <p class="text-center">
-                    You have rejected a request to become an owner of the
-                    '<strong><a href="@Url.Package(@Model.PackageId)" title="The @Model.PackageId package">@Model.PackageId</a></strong>' package!
-                </p>
-                break;
-
-            case ConfirmOwnershipResult.Cancelled:
-                <p class="text-center">
-                    You have cancelled your request for <strong>@Model.Username</strong> to become an owner of the
-                    '<strong><a href="@Url.Package(@Model.PackageId)" title="The @Model.PackageId package">@Model.PackageId</a></strong>' package!
-                </p>
-                break;
-
-            case ConfirmOwnershipResult.AlreadyOwner:
-                @ViewHelpers.AlertInfo(
-                    @<text>
-                        You are already an owner of the
-                        '<strong><a href="@Url.Package(@Model.PackageId)" title="The @Model.PackageId package">@Model.PackageId</a></strong>' package.
-                    </text>
-                        )
-
-                <p class="text-center">
-                    If you manage multiple accounts, make sure you sign in as the user who received the request before clicking the confirmation link.
-                </p>
-                break;
-
-            case ConfirmOwnershipResult.NotYourRequest:
-                @* Note that we're not confirming that a request even exists for this user, it's just a string compare against the name in the URL *@
-                @ViewHelpers.AlertDanger(
-                    @<text>
-                        This request link is for the user '@Model.Username'. If you wish to accept it,
-                        please sign in as that user and click the link again.
-                    </text>
-                )
-                break;
+            <p class="text-center">
+                You are now an owner of the
+                '<strong><a href="@Url.Package(@Model.PackageId)" title="The @Model.PackageId package">@Model.PackageId</a></strong>' package!
+            </p>
+        }
+        else if (Model.Result == ConfirmOwnershipResult.AlreadyOwner)
+        {
+            @ViewHelpers.AlertInfo(
+                @<text>
+                    You are already an owner of the
+                    '<strong><a href="@Url.Package(@Model.PackageId)" title="The @Model.PackageId package">@Model.PackageId</a></strong>' package.
+                </text>
+            )
 
-            default:
-                @ViewHelpers.AlertDanger(
-                    @<text>
-                        Could not confirm package ownership for '@Model.PackageId'.
-                    </text>
-                )
+            <p class="text-center">
+                If you manage multiple accounts, make sure you sign in as the user who received the request before clicking the confirmation link.
+            </p>
+        }
+        else if (Model.Result == ConfirmOwnershipResult.NotYourRequest)
+        {
+            @* Note that we're not confirming that a request even exists for this user, it's just a string compare against the name in the URL *@
+            @ViewHelpers.AlertDanger(
+                @<text>
+                    This request link is for the user '@Model.Username'. If you wish to accept it,
+                    please sign in as that user and click the link again.
+                </text>
+            )
+        }
+        else
+        {
+            @ViewHelpers.AlertDanger(
+                @<text>
+                    Could not confirm package ownership for '@Model.PackageId'.
+                </text>
+            )
 
-                <p class="text-center">
-                    Make sure you clicked on the confirmation URL in the email we sent.
-                    It's also possible that the existing owner revoked the
-                    request to add you as an owner.
-                </p>
-                break;
+            <p class="text-center">
+                Make sure you clicked on the confirmation URL in the email we sent.
+                It's also possible that the existing owner revoked the
+                request to add you as an owner.
+            </p>
         }
     </div>
 </section>
\ No newline at end of file
diff --git a/src/NuGetGallery/Views/Users/Packages.cshtml b/src/NuGetGallery/Views/Users/Packages.cshtml
index dcf200ea93..c6bd706519 100644
--- a/src/NuGetGallery/Views/Users/Packages.cshtml
+++ b/src/NuGetGallery/Views/Users/Packages.cshtml
@@ -18,20 +18,6 @@
         @Html.Partial("_UserPackagesList", new ManagePackagesListViewModel(listedPackages, "Published"))
         @Html.Partial("_UserPackagesList", new ManagePackagesListViewModel(unlistedPackages, "Unlisted"))
     }
-
-    @{
-        if (Model.OwnerRequests.Incoming.RequestItems.Any() || Model.OwnerRequests.Outgoing.RequestItems.Any())
-        {
-            <div class="row">
-                <div class="col-xs-12">
-                    <h1>Manage Ownership Requests</h1>
-                </div>
-            </div>
-
-            @Html.Partial("_OwnerRequestsList", Model.OwnerRequests.Incoming)
-            @Html.Partial("_OwnerRequestsList", Model.OwnerRequests.Outgoing)
-        }
-    }
 </section>
 
 @section BottomScripts {
diff --git a/src/NuGetGallery/Views/Users/_OwnerRequestsList.cshtml b/src/NuGetGallery/Views/Users/_OwnerRequestsList.cshtml
deleted file mode 100644
index af016d854a..0000000000
--- a/src/NuGetGallery/Views/Users/_OwnerRequestsList.cshtml
+++ /dev/null
@@ -1,78 +0,0 @@
-@model OwnerRequestsListViewModel
-@{
-    var requestsString = "request" + (Model.RequestItems.Count() != 1 ? "s" : "");
-
-    if (!Model.RequestItems.Any())
-    {
-        return;
-    }
-}
-
-<div class="row user-package-list">
-    <div class="col-md-12">
-        <h2>
-            <a href="#" role="button" data-toggle="collapse" data-target="#requests-@Model.Name"
-               aria-expanded="true" aria-controls="requests-@Model.Name" id="show-requests-@Model.Name">
-                <i class="ms-Icon ms-Icon--ChevronDown" aria-hidden="true"></i>
-                <span>Pending Ownership Requests (@Model.Name)</span>
-            </a>
-        </h2>
-        <div class="panel-collapse collapse in" id="requests-@Model.Name" aria-expanded="true">
-            <p>
-                You have <b>@Model.RequestItems.Count().ToNuGetNumberString() @Model.Name.ToLowerInvariant() @requestsString</b>
-            </p>
-            <div class="list-packages" role="list">
-                <table class="table">
-                    <thead>
-                        <tr class="manage-package-headings">
-                            <th class="hidden-xs"></th>
-                            <th>Package ID</th>
-                            <th>Existing Owner</th>
-                            <th>New Owner</th>
-                            <th></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var requestItem in @Model.RequestItems)
-                        {
-                            var packageId = requestItem.Request.PackageRegistration.Id;
-
-                            <tr class="manage-package-listing">
-                                <td class="align-middle hidden-xs">
-                                    <img class="package-icon img-responsive" aria-hidden="true" alt=""
-                                         src="@(PackageHelper.ShouldRenderUrl(requestItem.Package.IconUrl) ? requestItem.Package.IconUrl : Url.Absolute("~/Content/gallery/img/default-package-icon.svg"))"
-                                         @ViewHelpers.ImageFallback(Url.Absolute("~/Content/gallery/img/default-package-icon-256x256.png")) />
-                                </td>
-                                <td class="align-middle package-id"><a href="@Url.Package(packageId)">@Html.BreakWord(packageId)</a></td>
-                                <td class="align-middle">
-                                    <a href="@Url.User(requestItem.Request.RequestingOwner)">@requestItem.Request.RequestingOwner.Username</a>
-                                </td>
-                                <td class="align-middle text-nowrap">
-                                    <a href="@Url.User(requestItem.Request.NewOwner)">@requestItem.Request.NewOwner.Username</a>
-                                </td>
-                                <td class="text-right align-middle package-controls">
-                                    @if (CurrentUser.Key == requestItem.Request.NewOwnerKey)
-                                    {
-                                        <a href="@Url.ConfirmPendingOwnershipRequest(packageId, CurrentUser.Username, requestItem.Request.ConfirmationCode)" class="btn" title="Confirm Ownership" aria-label="Confirm Ownership of @packageId">
-                                            <i class="ms-Icon ms-Icon--Accept" aria-hidden="true"></i>
-                                        </a>
-
-                                        <a href="@Url.RejectPendingOwnershipRequest(packageId, CurrentUser.Username, requestItem.Request.ConfirmationCode)" class="btn" title="Reject Ownership" aria-label="Reject Ownership Request of @packageId">
-                                            <i class="ms-Icon ms-Icon--Cancel" aria-hidden="true"></i>
-                                        </a>
-                                    }
-                                    else
-                                    {
-                                        <a href="@Url.CancelPendingOwnershipRequest(packageId, CurrentUser.Username, requestItem.Request.NewOwner.Username)" class="btn" title="Cancel Ownership" aria-label="Cancel Ownership Request of @requestItem.Request.NewOwner.Username to Own @packageId">
-                                            <i class="ms-Icon ms-Icon--Cancel" aria-hidden="true"></i>
-                                        </a>
-                                    }
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs
index 6459bbef39..2b188e3288 100644
--- a/tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/JsonApiControllerFacts.cs
@@ -237,15 +237,12 @@ public void ReturnsDetailedConfirmationIfPendingOwnerPropagatesPolicy()
                 fakes.ShaUser.SecurityPolicies = (new RequireSecurePushForCoOwnersPolicy().Policies).ToList();
                 var pendingOwner = new PackageOwnerRequest()
                 {
-                    PackageRegistration = fakes.Package,
                     PackageRegistrationKey = fakes.Package.Key,
-                    NewOwner = fakes.ShaUser,
-                    NewOwnerKey = fakes.ShaUser.Key
+                    NewOwner = fakes.ShaUser
                 };
-
-                GetMock<IPackageOwnerRequestService>()
-                    .Setup(p => p.GetPackageOwnershipRequests(fakes.Package, null, null))
-                    .Returns((new [] { pendingOwner }));
+                GetMock<IEntityRepository<PackageOwnerRequest>>()
+                    .Setup(r => r.GetAll())
+                    .Returns((new [] { pendingOwner }).AsQueryable());
 
                 // Act
                 var result = controller.GetAddPackageOwnerConfirmation(fakes.Package.Id, fakes.User.Username);
@@ -275,10 +272,9 @@ public void DoesNotReturnConfirmationIfPendingOwnerPropagatesButNewOwnerIsSubscr
                     PackageRegistrationKey = fakes.Package.Key,
                     NewOwner = fakes.ShaUser
                 };
-
-                GetMock<IPackageOwnerRequestService>()
-                    .Setup(p => p.GetPackageOwnershipRequests(fakes.Package, null, fakes.ShaUser))
-                    .Returns((new[] { pendingOwner }));
+                GetMock<IEntityRepository<PackageOwnerRequest>>()
+                    .Setup(r => r.GetAll())
+                    .Returns((new[] { pendingOwner }).AsQueryable());
 
                 // Act
                 var result = controller.GetAddPackageOwnerConfirmation(fakes.Package.Id, fakes.User.Username);
@@ -417,9 +413,9 @@ public async Task CreatesPackageOwnerRequestSendsEmailAndReturnsPendingState()
                     .Returns(Fakes.ToPrincipal(fakes.Owner))
                     .Verifiable();
 
-                var packageOwnerRequestServiceMock = GetMock<IPackageOwnerRequestService>();
-                packageOwnerRequestServiceMock
-                    .Setup(p => p.AddPackageOwnershipRequest(fakes.Package, fakes.Owner, fakes.User))
+                var packageServiceMock = GetMock<IPackageService>();
+                packageServiceMock
+                    .Setup(p => p.CreatePackageOwnerRequestAsync(fakes.Package, fakes.Owner, fakes.User))
                     .Returns(Task.FromResult(new PackageOwnerRequest { ConfirmationCode = "confirmation-code" }))
                     .Verifiable();
 
@@ -431,7 +427,6 @@ public async Task CreatesPackageOwnerRequestSendsEmailAndReturnsPendingState()
                         fakes.Package,
                         TestUtility.GallerySiteRootHttps + "packages/FakePackage/",
                         TestUtility.GallerySiteRootHttps + "packages/FakePackage/owners/testUser/confirm/confirmation-code",
-                        TestUtility.GallerySiteRootHttps + "packages/FakePackage/owners/testUser/reject/confirmation-code",
                         "Hello World! Html Encoded &lt;3",
                         ""))
                     .Verifiable();
@@ -444,7 +439,7 @@ public async Task CreatesPackageOwnerRequestSendsEmailAndReturnsPendingState()
                 Assert.True(data.pending);
 
                 httpContextMock.Verify();
-                packageOwnerRequestServiceMock.Verify();
+                packageServiceMock.Verify();
                 messageServiceMock.Verify();
             }
 
@@ -479,20 +474,15 @@ public async Task SendsPackageOwnerRequestEmailWherePendingOwnerPropagatesPolicy
             {
                 // Arrange & Act
                 var fakes = Get<Fakes>();
-                
-                var packageOwnerRequestServiceMock = GetMock<IPackageOwnerRequestService>();
-                packageOwnerRequestServiceMock
-                    .Setup(p => p.GetPackageOwnershipRequests(fakes.Package, null, null))
-                    .Returns(
-                        new[]
-                        {
-                            new PackageOwnerRequest
-                            {
-                                PackageRegistration = fakes.Package,
-                                NewOwner = fakes.ShaUser
-                            }
-                        })
-                    .Verifiable();
+
+                var pendingOwner = new PackageOwnerRequest()
+                {
+                    PackageRegistrationKey = fakes.Package.Key,
+                    NewOwner = fakes.ShaUser
+                };
+                GetMock<IEntityRepository<PackageOwnerRequest>>()
+                    .Setup(r => r.GetAll())
+                    .Returns((new[] { pendingOwner }).AsQueryable());
 
                 var policyMessage = await GetSendPackageOwnerRequestPolicyMessage(fakes, fakes.ShaUser);
 
@@ -513,17 +503,10 @@ private async Task<string> GetSendPackageOwnerRequestPolicyMessage(Fakes fakes,
 
                 userToSubscribe.SecurityPolicies = (new RequireSecurePushForCoOwnersPolicy().Policies).ToList();
 
-                var packageOwnerRequestServiceMock = GetMock<IPackageOwnerRequestService>();
-                packageOwnerRequestServiceMock
-                    .Setup(p => p.AddPackageOwnershipRequest(fakes.Package, fakes.Owner, fakes.User))
-                    .Returns(Task.FromResult(
-                        new PackageOwnerRequest
-                        {
-                            PackageRegistration = fakes.Package,
-                            RequestingOwner = fakes.Owner,
-                            NewOwner = fakes.User,
-                            ConfirmationCode = "confirmation-code"
-                        }))
+                var packageServiceMock = GetMock<IPackageService>();
+                packageServiceMock
+                    .Setup(p => p.CreatePackageOwnerRequestAsync(fakes.Package, fakes.Owner, fakes.User))
+                    .Returns(Task.FromResult(new PackageOwnerRequest { ConfirmationCode = "confirmation-code" }))
                     .Verifiable();
 
                 string actualMessage = string.Empty;
@@ -534,11 +517,10 @@ private async Task<string> GetSendPackageOwnerRequestPolicyMessage(Fakes fakes,
                         fakes.Package,
                         TestUtility.GallerySiteRootHttps + "packages/FakePackage/",
                         TestUtility.GallerySiteRootHttps + "packages/FakePackage/owners/testUser/confirm/confirmation-code",
-                        TestUtility.GallerySiteRootHttps + "packages/FakePackage/owners/testUser/reject/confirmation-code",
                         string.Empty,
                         It.IsAny<string>()))
-                    .Callback<User, User, PackageRegistration, string, string, string, string, string>(
-                        (from, to, pkg, pkgUrl, cnfUrl, rjUrl, msg, policyMsg) => actualMessage = policyMsg);
+                    .Callback<User, User, PackageRegistration, string, string, string, string>(
+                        (from, to, pkg, pkgUrl, cnfUrl, msg, policyMsg) => actualMessage = policyMsg);
 
                 // Act
                 JsonResult result = await controller.AddPackageOwner(fakes.Package.Id, fakes.User.Username, string.Empty);
diff --git a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
index 685da310be..5dc030cfce 100644
--- a/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
+++ b/tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Net.Mail;
 using System.Threading.Tasks;
 using System.Web;
@@ -13,7 +12,6 @@
 using System.Web.Routing;
 using Moq;
 using NuGet.Packaging;
-using NuGetGallery;
 using NuGetGallery.Areas.Admin;
 using NuGetGallery.AsyncFileUpload;
 using NuGetGallery.Auditing;
@@ -22,7 +20,6 @@
 using NuGetGallery.Helpers;
 using NuGetGallery.Packaging;
 using NuGetGallery.Security;
-using NuGetGallery.TestUtils;
 using Xunit;
 
 namespace NuGetGallery
@@ -33,9 +30,7 @@ public class PackagesControllerFacts
         private static PackagesController CreateController(
             IGalleryConfigurationService configurationService,
             Mock<IPackageService> packageService = null,
-            Mock<IPackageOwnerRequestService> packageOwnerRequestService = null,
             Mock<IUploadFileService> uploadFileService = null,
-            Mock<IUserService> userService = null,
             Mock<IMessageService> messageService = null,
             Mock<HttpContextBase> httpContext = null,
             Mock<EditPackageService> editPackageService = null,
@@ -56,7 +51,6 @@ private static PackagesController CreateController(
             Mock<IPackageUploadService> packageUploadService = null)
         {
             packageService = packageService ?? new Mock<IPackageService>();
-            packageOwnerRequestService = packageOwnerRequestService ?? new Mock<IPackageOwnerRequestService>();
             if (uploadFileService == null)
             {
                 uploadFileService = new Mock<IUploadFileService>();
@@ -64,7 +58,6 @@ private static PackagesController CreateController(
                 uploadFileService.Setup(x => x.GetUploadFileAsync(42)).Returns(Task.FromResult<Stream>(null));
                 uploadFileService.Setup(x => x.SaveUploadFileAsync(42, It.IsAny<Stream>())).Returns(Task.FromResult(0));
             }
-            userService = userService ?? new Mock<IUserService>();
             messageService = messageService ?? new Mock<IMessageService>();
             searchService = searchService ?? CreateSearchService();
             autoCuratePackageCmd = autoCuratePackageCmd ?? new Mock<IAutomaticallyCuratePackageCommand>();
@@ -111,9 +104,7 @@ private static PackagesController CreateController(
 
             var controller = new Mock<PackagesController>(
                 packageService.Object,
-                packageOwnerRequestService.Object,
                 uploadFileService.Object,
-                userService.Object,
                 messageService.Object,
                 searchService.Object,
                 autoCuratePackageCmd.Object,
@@ -592,34 +583,11 @@ private async Task<ActionResult> GetDisplayPackageResult(string readMeHtml, bool
             }
         }
 
-        public class TheOwnershipRequestMethods : TestContainer
+        public class TheConfirmOwnerMethod : TestContainer
         {
-            public delegate Task<ActionResult> InvokeOwnershipRequest(PackagesController packagesController, string id, string username, string token);
-
-            private static Task<ActionResult> ConfirmOwnershipRequest(PackagesController packagesController, string id, string username, string token)
-            {
-                return packagesController.ConfirmPendingOwnershipRequest(id, username, token);
-            }
-
-            private static Task<ActionResult> RejectOwnershipRequest(PackagesController packagesController, string id, string username, string token)
-            {
-                return packagesController.RejectPendingOwnershipRequest(id, username, token);
-            }
-
-            public static IEnumerable<object[]> TheOwnershipRequestMethods_Data
-            {
-                get
-                {
-                    yield return new object[] { new InvokeOwnershipRequest(ConfirmOwnershipRequest) };
-                    yield return new object[] { new InvokeOwnershipRequest(RejectOwnershipRequest) };
-                }
-            }
-
-            [Theory]
-            [MemberData("TheOwnershipRequestMethods_Data")]
-            public async Task WithEmptyTokenReturnsHttpNotFound(InvokeOwnershipRequest invokeOwnershipRequest)
+            [Fact]
+            public async Task WithEmptyTokenReturnsHttpNotFound()
             {
-                // Arrange
                 var packageService = new Mock<IPackageService>();
                 packageService.Setup(p => p.FindPackageRegistrationById("foo")).Returns(new PackageRegistration());
                 var controller = CreateController(
@@ -627,48 +595,39 @@ public async Task WithEmptyTokenReturnsHttpNotFound(InvokeOwnershipRequest invok
                     packageService: packageService);
                 controller.SetCurrentUser(new User { Username = "username" });
 
-                // Act
-                var result = await invokeOwnershipRequest(controller, "foo", "username", "");
+                var result = await controller.ConfirmOwner("foo", "username", "");
 
-                // Assert
                 Assert.IsType<HttpNotFoundResult>(result);
             }
 
-            [Theory]
-            [MemberData("TheOwnershipRequestMethods_Data")]
-            public async Task WithIdentityNotMatchingUserInRequestReturnsViewWithMessage(InvokeOwnershipRequest invokeOwnershipRequest)
+            [Fact]
+            public async Task WithIdentityNotMatchingUserInRequestReturnsViewWithMessage()
             {
-                // Arrange
                 var controller = CreateController(GetConfigurationService());
                 controller.SetCurrentUser(new User("userA"));
+                var result = await controller.ConfirmOwner("foo", "userB", "token");
 
-                // Act
-                var result = await invokeOwnershipRequest(controller, "foo", "userB", "token");
-
-                // Assert
-                var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result, "ConfirmOwner");
+                var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result);
                 Assert.Equal(ConfirmOwnershipResult.NotYourRequest, model.Result);
                 Assert.Equal("userB", model.Username);
             }
 
-            [Theory]
-            [MemberData("TheOwnershipRequestMethods_Data")]
-            public async Task WithNonExistentPackageIdReturnsHttpNotFound(InvokeOwnershipRequest invokeOwnershipRequest)
+            [Fact]
+            public async Task WithNonExistentPackageIdReturnsHttpNotFound()
             {
                 // Arrange
                 var controller = CreateController(GetConfigurationService());
                 controller.SetCurrentUser(new User { Username = "username" });
 
                 // Act
-                var result = await invokeOwnershipRequest(controller, "foo", "username", "token");
+                var result = await controller.ConfirmOwner("foo", "username", "token");
 
                 // Assert
                 Assert.IsType<HttpNotFoundResult>(result);
             }
 
-            [Theory]
-            [MemberData("TheOwnershipRequestMethods_Data")]
-            public async Task WithOwnerReturnsAlreadyOwnerResult(InvokeOwnershipRequest invokeOwnershipRequest)
+            [Fact]
+            public async Task WithOwnerReturnsAlreadyOwnerResult()
             {
                 // Arrange
                 var package = new PackageRegistration { Id = "foo" };
@@ -685,249 +644,43 @@ public async Task WithOwnerReturnsAlreadyOwnerResult(InvokeOwnershipRequest invo
                 TestUtility.SetupHttpContextMockForUrlGeneration(mockHttpContext, controller);
 
                 // Act
-                var result = await invokeOwnershipRequest(controller, "foo", "username", "token");
+                var result = await controller.ConfirmOwner("foo", "username", "token");
 
                 // Assert
-                var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result, "ConfirmOwner");
+                var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result);
                 Assert.Equal(ConfirmOwnershipResult.AlreadyOwner, model.Result);
             }
 
-            public delegate Expression<Func<IPackageService, Task>> PackageServiceForOwnershipRequestExpression(PackageRegistration package, User user);
-
-            private static Expression<Func<IPackageService, Task>> PackagesServiceForConfirmOwnershipRequestExpression(PackageRegistration package, User user)
-            {
-                return packageService => packageService.AddPackageOwnerAsync(package, user);
-            }
-
-            private static Expression<Func<IPackageService, Task>> PackagesServiceForRejectOwnershipRequestExpression(PackageRegistration package, User user)
-            {
-                return packageService => packageService.RemovePackageOwnerAsync(package, user);
-            }
-
-            public delegate Expression<Action<IMessageService>> MessageServiceForOwnershipRequestExpression(PackageOwnerRequest request);
-
-            private static Expression<Action<IMessageService>> MessageServiceForConfirmOwnershipRequestExpression(PackageOwnerRequest request)
-            {
-                return messageService => messageService.SendPackageOwnerAddedNotice(
-                    request.RequestingOwner,
-                    request.NewOwner,
-                    request.PackageRegistration,
-                    It.IsAny<string>(), // The method that creates this URL correctly is not set up for these tests, so we cannot assert the expected value.
-                    string.Empty);
-            }
-
-            private static Expression<Action<IMessageService>> MessageServiceForRejectOwnershipRequestExpression(PackageOwnerRequest request)
-            {
-                return messageService => messageService.SendPackageOwnerRequestRejectionNotice(request.RequestingOwner, request.NewOwner, request.PackageRegistration);
-            }
-
-            public static IEnumerable<object[]> ReturnsSuccessIfTokenIsValid_Data
-            {
-                get
-                {
-                    foreach (var tokenValid in new bool[] { true, false })
-                    {
-                        yield return new object[]
-                        {
-                            new InvokeOwnershipRequest(ConfirmOwnershipRequest),
-                            new PackageServiceForOwnershipRequestExpression(PackagesServiceForConfirmOwnershipRequestExpression),
-                            new MessageServiceForOwnershipRequestExpression(MessageServiceForConfirmOwnershipRequestExpression),
-                            ConfirmOwnershipResult.Success,
-                            tokenValid
-                        };
-                        yield return new object[]
-                        {
-                            new InvokeOwnershipRequest(RejectOwnershipRequest),
-                            new PackageServiceForOwnershipRequestExpression(PackagesServiceForRejectOwnershipRequestExpression),
-                            new MessageServiceForOwnershipRequestExpression(MessageServiceForRejectOwnershipRequestExpression),
-                            ConfirmOwnershipResult.Rejected,
-                            tokenValid
-                        };
-                    }
-                }
-            }
-
             [Theory]
-            [MemberData("ReturnsSuccessIfTokenIsValid_Data")]
-            public async Task ReturnsSuccessIfTokenIsValid(InvokeOwnershipRequest invokeOwnershipRequest, PackageServiceForOwnershipRequestExpression packageServiceExpression, MessageServiceForOwnershipRequestExpression messageServiceExpression, ConfirmOwnershipResult successState, bool tokenValid)
+            [InlineData(true)]
+            [InlineData(false)]
+            public async Task ReturnsSuccessIfTokenIsValid(bool tokenValid)
             {
                 // Arrange
-                var owner = new User { Key = 1, Username = "owner" };
-                var package = new PackageRegistration { Id = "foo", Owners = new[] { owner } };
-                var user = new User { Key = 2, Username = "username" };
-
+                var package = new PackageRegistration { Id = "foo" };
+                var user = new User { Username = "username" };
                 var mockHttpContext = new Mock<HttpContextBase>();
-
                 var packageService = new Mock<IPackageService>();
                 packageService.Setup(p => p.FindPackageRegistrationById("foo")).Returns(package);
+                packageService.Setup(p => p.IsValidPackageOwnerRequest(package, user, "token"))
+                    .Returns(tokenValid);
                 packageService.Setup(p => p.AddPackageOwnerAsync(package, user)).Returns(Task.CompletedTask).Verifiable();
-
-                var packageOwnerRequestService = new Mock<IPackageOwnerRequestService>();
-                var request = new PackageOwnerRequest
-                {
-                    PackageRegistration = package,
-                    RequestingOwner = owner,
-                    NewOwner = user,
-                    ConfirmationCode = "token"
-                };
-                packageOwnerRequestService.Setup(p => p.GetPackageOwnershipRequest(package, user, "token"))
-                    .Returns(tokenValid ? request : null);
-
-                var messageService = new Mock<IMessageService>();
-
                 var controller = CreateController(
                     GetConfigurationService(),
                     httpContext: mockHttpContext,
-                    packageService: packageService,
-                    packageOwnerRequestService: packageOwnerRequestService,
-                    messageService: messageService);
+                    packageService: packageService);
                 controller.SetCurrentUser(user);
                 TestUtility.SetupHttpContextMockForUrlGeneration(mockHttpContext, controller);
 
                 // Act
-                var result = await invokeOwnershipRequest(controller, "foo", "username", "token");
+                var result = await controller.ConfirmOwner("foo", "username", "token");
 
                 // Assert
-                var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result, "ConfirmOwner");
-                var expectedResult = tokenValid ? successState : ConfirmOwnershipResult.Failure;
+                var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result);
+                var expectedResult = tokenValid ? ConfirmOwnershipResult.Success : ConfirmOwnershipResult.Failure;
                 Assert.Equal(expectedResult, model.Result);
                 Assert.Equal("foo", model.PackageId);
-                packageService.Verify(packageServiceExpression(package, user), tokenValid ? Times.Once() : Times.Never());
-                messageService.Verify(messageServiceExpression(request), tokenValid ? Times.Once() : Times.Never());
-            }
-
-            public class TheCancelPendingOwnershipRequestMethod : TestContainer
-            {
-                [Fact]
-                public async Task WithIdentityNotMatchingUserInRequestReturnsViewWithMessage()
-                {
-                    // Arrange
-                    var controller = CreateController(GetConfigurationService());
-                    controller.SetCurrentUser(new User("userA"));
-
-                    // Act
-                    var result = await controller.CancelPendingOwnershipRequest("foo", "userB", "userC");
-
-                    // Assert
-                    var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result, "ConfirmOwner");
-                    Assert.Equal(ConfirmOwnershipResult.NotYourRequest, model.Result);
-                    Assert.Equal("userB", model.Username);
-                }
-
-                [Fact]
-                public async Task WithNonExistentPackageIdReturnsHttpNotFound()
-                {
-                    // Arrange
-                    var controller = CreateController(GetConfigurationService());
-                    controller.SetCurrentUser(new User { Username = "userA" });
-
-                    // Act
-                    var result = await controller.CancelPendingOwnershipRequest("foo", "userA", "userB");
-
-                    // Assert
-                    Assert.IsType<HttpNotFoundResult>(result);
-                }
-
-                [Fact]
-                public async Task WithNonExistentPendingUserReturnsHttpNotFound()
-                {
-                    // Arrange
-                    var package = new PackageRegistration { Id = "foo" };
-                    var user = new User { Username = "userA" };
-                    var packageService = new Mock<IPackageService>();
-                    packageService.Setup(p => p.FindPackageRegistrationById("foo")).Returns(package);
-                    var controller = CreateController(
-                        GetConfigurationService(),
-                        packageService: packageService);
-                    controller.SetCurrentUser(user);
-
-                    // Act
-                    var result = await controller.CancelPendingOwnershipRequest("foo", "userA", "userB");
-
-                    // Assert
-                    Assert.IsType<HttpNotFoundResult>(result);
-                }
-
-                [Fact]
-                public async Task WithNonExistentPackageOwnershipRequestReturnsHttpNotFound()
-                {
-                    // Arrange
-                    var packageId = "foo";
-                    var package = new PackageRegistration { Id = packageId };
-
-                    var packageService = new Mock<IPackageService>();
-                    packageService.Setup(p => p.FindPackageRegistrationById(packageId)).Returns(package);
-
-                    var userAName = "userA";
-                    var userA = new User { Username = userAName };
-
-                    var userBName = "userB";
-                    var userB = new User { Username = userBName };
-
-                    var userService = new Mock<IUserService>();
-                    userService.Setup(u => u.FindByUsername(userAName)).Returns(userA);
-                    userService.Setup(u => u.FindByUsername(userBName)).Returns(userB);
-
-                    var controller = CreateController(
-                        GetConfigurationService(),
-                        userService: userService,
-                        packageService: packageService);
-                    controller.SetCurrentUser(userA);
-
-                    // Act
-                    var result = await controller.CancelPendingOwnershipRequest(packageId, userAName, userBName);
-
-                    // Assert
-                    Assert.IsType<HttpNotFoundResult>(result);
-                }
-
-                [Fact]
-                public async Task ReturnsCancelledIfPackageOwnershipRequestExists()
-                {
-                    // Arrange
-                    var packageId = "foo";
-                    var package = new PackageRegistration { Id = packageId };
-
-                    var packageService = new Mock<IPackageService>();
-                    packageService.Setup(p => p.FindPackageRegistrationById(packageId)).Returns(package);
-
-                    var userAName = "userA";
-                    var userA = new User { Username = userAName };
-
-                    var userBName = "userB";
-                    var userB = new User { Username = userBName };
-
-                    var userService = new Mock<IUserService>();
-                    userService.Setup(u => u.FindByUsername(userAName)).Returns(userA);
-                    userService.Setup(u => u.FindByUsername(userBName)).Returns(userB);
-
-                    var request = new PackageOwnerRequest() { RequestingOwner = userA, NewOwner = userB };
-                    var packageOwnerRequestService = new Mock<IPackageOwnerRequestService>();
-                    packageOwnerRequestService.Setup(p => p.GetPackageOwnershipRequests(package, userA, userB)).Returns(new[] { request });
-                    packageOwnerRequestService.Setup(p => p.DeletePackageOwnershipRequest(request)).Returns(Task.CompletedTask).Verifiable();
-
-                    var messageService = new Mock<IMessageService>();
-
-                    var controller = CreateController(
-                        GetConfigurationService(),
-                        userService: userService,
-                        packageService: packageService,
-                        packageOwnerRequestService: packageOwnerRequestService,
-                        messageService: messageService);
-                    controller.SetCurrentUser(userA);
-
-                    // Act
-                    var result = await controller.CancelPendingOwnershipRequest(packageId, userAName, userBName);
-
-                    // Assert
-                    var model = ResultAssert.IsView<PackageOwnerConfirmationModel>(result, "ConfirmOwner");
-                    var expectedResult = ConfirmOwnershipResult.Cancelled;
-                    Assert.Equal(expectedResult, model.Result);
-                    Assert.Equal(packageId, model.PackageId);
-                    packageService.Verify();
-                    packageOwnerRequestService.Verify();
-                    messageService.Verify(m => m.SendPackageOwnerRequestCancellationNotice(userA, userB, package));
-                }
+                packageService.Verify(p => p.AddPackageOwnerAsync(package, user), tokenValid ? Times.Once() : Times.Never());
             }
 
             public class TheConfirmOwnerMethod_SecurePushPropagation : TestContainer
@@ -984,15 +737,7 @@ private async Task<IDictionary<string, string>> AssertConfirmOwnerSubscribesUser
 
                     var packageService = new Mock<IPackageService>();
                     packageService.Setup(p => p.FindPackageRegistrationById(It.IsAny<string>())).Returns(fakes.Package);
-
-                    var packageOwnerRequestService = new Mock<IPackageOwnerRequestService>();
-                    packageOwnerRequestService.Setup(p => p.GetPackageOwnershipRequest(fakes.Package, fakes.User, "token")).Returns(
-                        new PackageOwnerRequest
-                        {
-                            PackageRegistration = fakes.Package,
-                            NewOwner = fakes.User,
-                            ConfirmationCode = "token"
-                        });
+                    packageService.Setup(p => p.IsValidPackageOwnerRequest(fakes.Package, fakes.User, "token")).Returns(true);
 
                     var policyService = new Mock<ISecurityPolicyService>();
                     foreach (var user in usersSubscribed)
@@ -1015,7 +760,6 @@ private async Task<IDictionary<string, string>> AssertConfirmOwnerSubscribesUser
                         GetConfigurationService(),
                         httpContext: mockHttpContext,
                         packageService: packageService,
-                        packageOwnerRequestService: packageOwnerRequestService,
                         messageService: messageService,
                         securityPolicyService: policyService);
 
@@ -1023,7 +767,7 @@ private async Task<IDictionary<string, string>> AssertConfirmOwnerSubscribesUser
                     TestUtility.SetupHttpContextMockForUrlGeneration(mockHttpContext, controller);
 
                     // Act
-                    await controller.ConfirmPendingOwnershipRequest(fakes.Package.Id, fakes.User.Username, "token");
+                    await controller.ConfirmOwner(fakes.Package.Id, fakes.User.Username, "token");
 
                     // Assert
                     foreach (var user in usersSubscribed)
diff --git a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
index 0e10b1d710..a06f0642ea 100644
--- a/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
+++ b/tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
@@ -411,7 +411,6 @@
     <Compile Include="Controllers\UsersControllerFacts.cs" />
     <Compile Include="Framework\TestGalleryConfigurationService.cs" />
     <Compile Include="Helpers\HtmlExtensionsFacts.cs" />
-    <Compile Include="Services\PackageOwnerRequestServiceFacts.cs" />
     <Compile Include="Services\ReadMeServiceFacts.cs" />
     <Compile Include="Infrastructure\UserAuditRecordFacts.cs" />
     <Compile Include="OData\Filter\ODataFilterFacts.cs" />
diff --git a/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs
index 70dc554d9a..1840936f3b 100644
--- a/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs
@@ -363,13 +363,12 @@ public void SendsPackageOwnerRequestConfirmationUrl()
                 var package = new PackageRegistration { Id = "CoolStuff" };
                 const string packageUrl = "http://nuget.local/packages/CoolStuff";
                 const string confirmationUrl = "http://example.com/confirmation-token-url";
-                const string rejectionUrl = "http://example.com/rejection-token-url";
                 const string userMessage = "Hello World!";
 
                 var messageService = TestableMessageService.Create(
                     GetService<AuthenticationService>(),
                     GetConfigurationService());
-                messageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, rejectionUrl, userMessage, string.Empty);
+                messageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, userMessage, string.Empty);
                 var message = messageService.MockMailSender.Sent.Last();
 
                 Assert.Equal("new-owner@example.com", message.To[0].Address);
@@ -391,12 +390,11 @@ public void SendsPackageOwnerRequestConfirmationUrlWithoutUserMessage()
                 var package = new PackageRegistration { Id = "CoolStuff" };
                 const string packageUrl = "http://nuget.local/packages/CoolStuff";
                 const string confirmationUrl = "http://example.com/confirmation-token-url";
-                const string rejectionUrl = "http://example.com/rejection-token-url";
 
                 var messageService = TestableMessageService.Create(
                     GetService<AuthenticationService>(),
                     GetConfigurationService());
-                messageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, rejectionUrl, string.Empty, string.Empty);
+                messageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, string.Empty, string.Empty);
                 var message = messageService.MockMailSender.Sent.Last();
 
                 Assert.DoesNotContain("The user 'Existing' added the following message for you", message.Body);
@@ -410,111 +408,11 @@ public void DoesNotSendRequestIfUserDoesNotAllowEmails()
                 var package = new PackageRegistration { Id = "CoolStuff" };
                 const string packageUrl = "http://nuget.local/packages/CoolStuff";
                 const string confirmationUrl = "http://example.com/confirmation-token-url";
-                const string rejectionUrl = "http://example.com/rejection-token-url";
 
                 var messageService = TestableMessageService.Create(
                     GetService<AuthenticationService>(),
                     GetConfigurationService());
-                messageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, rejectionUrl, string.Empty, string.Empty);
-
-                Assert.Empty(messageService.MockMailSender.Sent);
-            }
-        }
-
-        public class TheSendPackageOwnerRequestRejectionNoticeMethod
-            : TestContainer
-        {
-            [Fact]
-            public void SendsNotice()
-            {
-                var requestingOwner = new User { Username = "Existing", EmailAddress = "existing-owner@example.com", EmailAllowed = true };
-                var newOwner = new User { Username = "Noob", EmailAddress = "new-owner@example.com" };
-                var package = new PackageRegistration { Id = "CoolStuff" };
-
-                var request = new PackageOwnerRequest
-                {
-                    PackageRegistration = package,
-                    RequestingOwner = requestingOwner,
-                    NewOwner = newOwner
-                };
-
-                var messageService = TestableMessageService.Create(
-                    GetService<AuthenticationService>(),
-                    GetConfigurationService());
-                messageService.SendPackageOwnerRequestRejectionNotice(requestingOwner, newOwner, package);
-                var message = messageService.MockMailSender.Sent.Last();
-
-                Assert.Equal(requestingOwner.EmailAddress, message.To[0].Address);
-                Assert.Equal(TestGalleryNoReplyAddress.Address, message.From.Address);
-                Assert.Equal(newOwner.EmailAddress, message.ReplyToList.Single().Address);
-                Assert.Equal("[Joe Shmoe] The user 'Noob' has rejected your request to add them as an owner of the package 'CoolStuff'.", message.Subject);
-                Assert.Contains("The user 'Noob' has rejected your request to add them as an owner of the package 'CoolStuff'.", message.Body);
-            }
-
-            [Fact]
-            public void DoesNotSendNoticeIfUserDoesNotAllowEmails()
-            {
-                var requestingOwner = new User { Username = "Existing", EmailAddress = "existing-owner@example.com" };
-                var newOwner = new User { Username = "Noob", EmailAddress = "new-owner@example.com" };
-                var package = new PackageRegistration { Id = "CoolStuff" };
-
-                var request = new PackageOwnerRequest
-                {
-                    PackageRegistration = package,
-                    RequestingOwner = requestingOwner,
-                    NewOwner = newOwner
-                };
-
-                var messageService = TestableMessageService.Create(
-                    GetService<AuthenticationService>(),
-                    GetConfigurationService());
-                messageService.SendPackageOwnerRequestRejectionNotice(requestingOwner, newOwner, package);
-
-                Assert.Empty(messageService.MockMailSender.Sent);
-            }
-        }
-
-        public class TheSendPackageOwnerRequestCancellationNoticeMethod
-            : TestContainer
-        {
-            [Fact]
-            public void SendsNotice()
-            {
-                var requestingOwner = new User { Username = "Existing", EmailAddress = "existing-owner@example.com" };
-                var newOwner = new User { Username = "Noob", EmailAddress = "new-owner@example.com", EmailAllowed = true };
-                var package = new PackageRegistration { Id = "CoolStuff" };
-
-                var messageService = TestableMessageService.Create(
-                    GetService<AuthenticationService>(),
-                    GetConfigurationService());
-                messageService.SendPackageOwnerRequestCancellationNotice(requestingOwner, newOwner, package);
-                var message = messageService.MockMailSender.Sent.Last();
-
-                Assert.Equal(newOwner.EmailAddress, message.To[0].Address);
-                Assert.Equal(TestGalleryNoReplyAddress.Address, message.From.Address);
-                Assert.Equal(requestingOwner.EmailAddress, message.ReplyToList.Single().Address);
-                Assert.Equal("[Joe Shmoe] The user 'Existing' has cancelled their request for you to be added as an owner of the package 'CoolStuff'.", message.Subject);
-                Assert.Contains("The user 'Existing' has cancelled their request for you to be added as an owner of the package 'CoolStuff'.", message.Body);
-            }
-
-            [Fact]
-            public void DoesNotSendNoticeIfUserDoesNotAllowEmails()
-            {
-                var requestingOwner = new User { Username = "Existing", EmailAddress = "existing-owner@example.com" };
-                var newOwner = new User { Username = "Noob", EmailAddress = "new-owner@example.com" };
-                var package = new PackageRegistration { Id = "CoolStuff" };
-
-                var request = new PackageOwnerRequest
-                {
-                    PackageRegistration = package,
-                    RequestingOwner = requestingOwner,
-                    NewOwner = newOwner
-                };
-
-                var messageService = TestableMessageService.Create(
-                    GetService<AuthenticationService>(),
-                    GetConfigurationService());
-                messageService.SendPackageOwnerRequestCancellationNotice(requestingOwner, newOwner, package);
+                messageService.SendPackageOwnerRequest(from, to, package, packageUrl, confirmationUrl, string.Empty, string.Empty);
 
                 Assert.Empty(messageService.MockMailSender.Sent);
             }
diff --git a/tests/NuGetGallery.Facts/Services/PackageOwnerRequestServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageOwnerRequestServiceFacts.cs
deleted file mode 100644
index a4bc574262..0000000000
--- a/tests/NuGetGallery.Facts/Services/PackageOwnerRequestServiceFacts.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Moq;
-using Xunit;
-
-namespace NuGetGallery.Services
-{
-    public class PackageOwnerRequestServiceFacts
-    {
-        public class TheIsValidPackageOwnerRequestMethod
-        {
-            [Fact]
-            public void ThrowsArgumentNullIfPackageIsNull()
-            {
-                Assert.Throws<ArgumentNullException>(() => CreateService().GetPackageOwnershipRequest(null, new User(), "token"));
-            }
-
-            [Fact]
-            public void ThrowsArgumentNullIfPendingOwnerIsNull()
-            {
-                Assert.Throws<ArgumentNullException>(() => CreateService().GetPackageOwnershipRequest(new PackageRegistration(), null, "token"));
-            }
-
-            [Theory]
-            [InlineData("")]
-            [InlineData(null)]
-            public void ThrowsArgumentNullIfTokenIsNullOrEmpty(string token)
-            {
-                Assert.Throws<ArgumentNullException>(() => CreateService().GetPackageOwnershipRequest(new PackageRegistration(), new User(), token));
-            }
-
-            [Theory]
-            [InlineData(1, 2, "token", true)]
-            [InlineData(2, 2, "token", false)]
-            [InlineData(1, 1, "token", false)]
-            [InlineData(1, 2, "token2", false)]
-            private void ReturnsSuccessIfPackageOwnerRequestMatches(int packageId, int userId, string token, bool success)
-            {
-                // Arrange
-                const int actualKey = 1;
-                const int actualNewOwner = 2;
-                const string actualToken = "token";
-
-                var package = new PackageRegistration { Key = packageId };
-                var pendingOwner = new User { Key = userId };
-
-                var repository = new Mock<IEntityRepository<PackageOwnerRequest>>();
-                repository.Setup(r => r.GetAll()).Returns(
-                    new[] 
-                    {
-                        new PackageOwnerRequest
-                        {
-                            PackageRegistration = new PackageRegistration { Key = actualKey },
-                            PackageRegistrationKey = actualKey,
-
-                            NewOwner = new User { Key = actualNewOwner },
-                            NewOwnerKey = actualNewOwner,
-
-                            ConfirmationCode = actualToken
-                        }
-                    }
-                    .AsQueryable());
-                var service = CreateService(packageOwnerRequestRepo: repository);
-
-                // Act
-                var request = service.GetPackageOwnershipRequest(package, pendingOwner, token);
-
-                // Assert
-                if (success)
-                {
-                    Assert.NotNull(request);
-                }
-                else
-                {
-                    Assert.Null(request);
-                }
-            }
-        }
-
-        public class TheAddPackageOwnershipRequestMethod
-        {
-            [Fact]
-            public async Task CreatesPackageOwnerRequest()
-            {
-                var packageOwnerRequestRepository = new Mock<IEntityRepository<PackageOwnerRequest>>();
-                var service = CreateService(packageOwnerRequestRepo: packageOwnerRequestRepository);
-                var package = new PackageRegistration { Key = 1 };
-                var owner = new User { Key = 100 };
-                var newOwner = new User { Key = 200 };
-
-                await service.AddPackageOwnershipRequest(package, owner, newOwner);
-
-                packageOwnerRequestRepository.Verify(
-                    r => r.InsertOnCommit(
-                        It.Is<PackageOwnerRequest>(req => req.PackageRegistrationKey == 1 && req.RequestingOwnerKey == 100 && req.NewOwnerKey == 200))
-                    );
-            }
-
-            [Fact]
-            public async Task ReturnsExistingMatchingPackageOwnerRequest()
-            {
-                // Arrange
-                var package = new PackageRegistration { Key = 1 };
-                var existingRequestingOwner = new User { Key = 100 };
-                var newRequestingOwner = new User { Key = 99 };
-                var newOwner = new User { Key = 200 };
-
-                var packageOwnerRequestRepository = new Mock<IEntityRepository<PackageOwnerRequest>>();
-                packageOwnerRequestRepository.Setup(r => r.GetAll()).Returns(
-                    new[]
-                    {
-                        new PackageOwnerRequest
-                        {
-                            PackageRegistration = package,
-                            PackageRegistrationKey = package.Key,
-
-                            RequestingOwner = existingRequestingOwner,
-                            RequestingOwnerKey = existingRequestingOwner.Key,
-
-                            NewOwner = newOwner,
-                            NewOwnerKey = newOwner.Key
-                        }
-                    }.AsQueryable());
-                var service = CreateService(packageOwnerRequestRepo: packageOwnerRequestRepository);
-
-                // Act
-                var request = await service.AddPackageOwnershipRequest(package, newRequestingOwner, newOwner);
-
-                // Assert
-                Assert.Equal(existingRequestingOwner.Key, request.RequestingOwnerKey);
-            }
-        }
-
-        private static IPackageOwnerRequestService CreateService(Mock<IEntityRepository<PackageOwnerRequest>> packageOwnerRequestRepo = null)
-        {
-            packageOwnerRequestRepo = packageOwnerRequestRepo ?? new Mock<IEntityRepository<PackageOwnerRequest>>();
-
-            return new PackageOwnerRequestService(packageOwnerRequestRepo.Object);
-        }
-    }
-}
diff --git a/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
index 7ffd99ea31..6a90e9dead 100644
--- a/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
@@ -23,7 +23,7 @@ public class PackageServiceFacts
         private static IPackageService CreateService(
             Mock<IEntityRepository<PackageRegistration>> packageRegistrationRepository = null,
             Mock<IEntityRepository<Package>> packageRepository = null,
-            Mock<IPackageOwnerRequestService> packageOwnerRequestService = null,
+            Mock<IEntityRepository<PackageOwnerRequest>> packageOwnerRequestRepo = null,
             Mock<IIndexingService> indexingService = null,
             IPackageNamingConflictValidator packageNamingConflictValidator = null,
             IAuditingService auditingService = null,
@@ -31,7 +31,7 @@ private static IPackageService CreateService(
         {
             packageRegistrationRepository = packageRegistrationRepository ?? new Mock<IEntityRepository<PackageRegistration>>();
             packageRepository = packageRepository ?? new Mock<IEntityRepository<Package>>();
-            packageOwnerRequestService = packageOwnerRequestService ?? new Mock<IPackageOwnerRequestService>();
+            packageOwnerRequestRepo = packageOwnerRequestRepo ?? new Mock<IEntityRepository<PackageOwnerRequest>>();
             indexingService = indexingService ?? new Mock<IIndexingService>();
             auditingService = auditingService ?? new TestAuditingService();
 
@@ -45,7 +45,7 @@ private static IPackageService CreateService(
             var packageService = new Mock<PackageService>(
                 packageRegistrationRepository.Object,
                 packageRepository.Object,
-                packageOwnerRequestService.Object,
+                packageOwnerRequestRepo.Object,
                 indexingService.Object,
                 packageNamingConflictValidator,
                 auditingService);
@@ -84,16 +84,21 @@ public async Task RemovesRelatedPendingOwnerRequest()
                 var packageOwnerRequest = new PackageOwnerRequest { PackageRegistrationKey = 2, NewOwnerKey = 100, ConfirmationCode = "secret-token" };
                 var package = new PackageRegistration { Key = 2, Id = "pkg42" };
                 var pendingOwner = new User { Key = 100, Username = "teamawesome" };
-                var packageOwnerRequestService = new Mock<IPackageOwnerRequestService>();
-                packageOwnerRequestService.Setup(p => p.DeletePackageOwnershipRequest(packageOwnerRequest))
+                var repository = new Mock<IEntityRepository<PackageOwnerRequest>>();
+                repository.Setup(r => r.DeleteOnCommit(packageOwnerRequest)).Verifiable();
+                repository.Setup(r => r.CommitChangesAsync())
                     .Returns(Task.CompletedTask).Verifiable();
-                packageOwnerRequestService.Setup(p => p.GetPackageOwnershipRequests(package, null, pendingOwner))
-                    .Returns(new[] { packageOwnerRequest }).Verifiable();
-                var service = CreateService(packageOwnerRequestService: packageOwnerRequestService);
+                repository.Setup(r => r.GetAll()).Returns(
+                    new[]
+                        {
+                            new PackageOwnerRequest { PackageRegistrationKey = 1, NewOwnerKey = 100, ConfirmationCode = "super-secret-token" },
+                            packageOwnerRequest
+                        }.AsQueryable());
+                var service = CreateService(packageOwnerRequestRepo: repository);
 
                 await service.AddPackageOwnerAsync(package, pendingOwner);
 
-                packageOwnerRequestService.VerifyAll();
+                repository.VerifyAll();
             }
 
             [Fact]
@@ -118,6 +123,49 @@ public async Task WritesAnAuditRecord()
             }
         }
 
+        public class TheIsValidPackageOwnerRequestMethod
+        {
+            [Fact]
+            public void ThrowsArgumentNullIfPackageIsNull()
+            {
+                Assert.Throws<ArgumentNullException>(() => CreateService().IsValidPackageOwnerRequest(null, new User(), "token"));
+            }
+
+            [Fact]
+            public void ThrowsArgumentNullIfPendingOwnerIsNull()
+            {
+                Assert.Throws<ArgumentNullException>(() => CreateService().IsValidPackageOwnerRequest(new PackageRegistration(), null, "token"));
+            }
+
+            [Theory]
+            [InlineData("")]
+            [InlineData(null)]
+            public void ThrowsArgumentNullIfTokenIsNullOrEmpty(string token)
+            {
+                Assert.Throws<ArgumentNullException>(() => CreateService().IsValidPackageOwnerRequest(new PackageRegistration(), new User(), token));
+            }
+
+            [Theory]
+            [InlineData(1, 2, "token", true)]
+            [InlineData(2, 2, "token", false)]
+            [InlineData(1, 1, "token", false)]
+            [InlineData(1, 2, "token2", false)]
+            private void ReturnsSuccessIfPackageOwnerRequestMatches(int packageId, int userId, string token, bool success)
+            {
+                // Arrange
+                var repository = new Mock<IEntityRepository<PackageOwnerRequest>>();
+                repository.Setup(r => r.GetAll()).Returns(
+                    new[] { new PackageOwnerRequest { PackageRegistrationKey = 1, NewOwnerKey = 2, ConfirmationCode = "token" } }
+                    .AsQueryable());
+                var service = CreateService(packageOwnerRequestRepo: repository);
+                var package = new PackageRegistration { Key = packageId, Id = "pkg42" };
+                var pendingOwner = new User { Key = userId, Username = "teamawesome" };
+
+                // Act & Assert
+                Assert.Equal(success, service.IsValidPackageOwnerRequest(package, pendingOwner, token));
+            }
+        }
+
         public class TheCreatePackageMethod
         {
             [Fact]
@@ -796,6 +844,50 @@ private async Task WillNotSaveAnySupportedFrameworksWhenThereIsAnAnyTargetFramew
             }
         }
 
+        public class TheCreatePackageOwnerRequestMethod
+        {
+            [Fact]
+            public async Task CreatesPackageOwnerRequest()
+            {
+                var packageOwnerRequestRepository = new Mock<IEntityRepository<PackageOwnerRequest>>();
+                var service = CreateService(packageOwnerRequestRepo: packageOwnerRequestRepository);
+                var package = new PackageRegistration { Key = 1 };
+                var owner = new User { Key = 100 };
+                var newOwner = new User { Key = 200 };
+
+                await service.CreatePackageOwnerRequestAsync(package, owner, newOwner);
+
+                packageOwnerRequestRepository.Verify(
+                    r => r.InsertOnCommit(
+                        It.Is<PackageOwnerRequest>(req => req.PackageRegistrationKey == 1 && req.RequestingOwnerKey == 100 && req.NewOwnerKey == 200))
+                    );
+            }
+
+            [Fact]
+            public async Task ReturnsExistingMatchingPackageOwnerRequest()
+            {
+                var packageOwnerRequestRepository = new Mock<IEntityRepository<PackageOwnerRequest>>();
+                packageOwnerRequestRepository.Setup(r => r.GetAll()).Returns(
+                    new[]
+                        {
+                            new PackageOwnerRequest
+                                {
+                                    PackageRegistrationKey = 1,
+                                    RequestingOwnerKey = 99,
+                                    NewOwnerKey = 200
+                                }
+                        }.AsQueryable());
+                var service = CreateService(packageOwnerRequestRepo: packageOwnerRequestRepository);
+                var package = new PackageRegistration { Key = 1 };
+                var owner = new User { Key = 100 };
+                var newOwner = new User { Key = 200 };
+
+                var request = await service.CreatePackageOwnerRequestAsync(package, owner, newOwner);
+
+                Assert.Equal(99, request.RequestingOwnerKey);
+            }
+        }
+
         public class TheUpdateIsLatestMethod
         {
             [Fact]
@@ -1962,31 +2054,26 @@ await Assert.ThrowsAsync<InvalidOperationException>(
             [Fact]
             public async Task RemovesPendingPackageOwner()
             {
-                var pendingOwner = new User { Key = 200 };
-                var owner = new User() { Key = 99 };
-                var package = new PackageRegistration { Key = 1, Owners = new List<User> { owner } };
-
                 var packageOwnerRequest = new PackageOwnerRequest
                 {
-                    PackageRegistration = package,
-                    PackageRegistrationKey = package.Key,
-
-                    RequestingOwner = owner,
-                    RequestingOwnerKey = owner.Key,
-
-                    NewOwner = pendingOwner,
-                    NewOwnerKey = pendingOwner.Key,
+                    PackageRegistrationKey = 1,
+                    RequestingOwnerKey = 99,
+                    NewOwnerKey = 200
                 };
-
-                var packageOwnerRequestService = new Mock<IPackageOwnerRequestService>();
-                packageOwnerRequestService.Setup(p => p.GetPackageOwnershipRequests(package, null, pendingOwner)).Returns(new[] { packageOwnerRequest });
-                packageOwnerRequestService.Setup(p => p.DeletePackageOwnershipRequest(packageOwnerRequest)).Returns(Task.CompletedTask).Verifiable();
-                var service = CreateService(packageOwnerRequestService: packageOwnerRequestService);
+                var packageOwnerRequestRepository = new Mock<IEntityRepository<PackageOwnerRequest>>();
+                packageOwnerRequestRepository.Setup(r => r.GetAll()).Returns(new[] { packageOwnerRequest }.AsQueryable());
+                packageOwnerRequestRepository.Setup(r => r.DeleteOnCommit(packageOwnerRequest)).Verifiable();
+                packageOwnerRequestRepository.Setup(r => r.CommitChangesAsync())
+                    .Returns(Task.CompletedTask).Verifiable();
+                var service = CreateService(packageOwnerRequestRepo: packageOwnerRequestRepository);
+                var pendingOwner = new User { Key = 200 };
+                var owner = new User();
+                var package = new PackageRegistration { Key = 1, Owners = new List<User> { owner } };
 
                 await service.RemovePackageOwnerAsync(package, pendingOwner);
 
                 Assert.Contains(owner, package.Owners);
-                packageOwnerRequestService.VerifyAll();
+                packageOwnerRequestRepository.VerifyAll();
             }
 
             [Fact]
diff --git a/tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs
index b6e387e312..cbdb09d675 100644
--- a/tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/ReflowPackageServiceFacts.cs
@@ -266,7 +266,7 @@ private static Mock<PackageService> SetupPackageService(Package package)
         {
             var packageRegistrationRepository = new Mock<IEntityRepository<PackageRegistration>>();
             var packageRepository = new Mock<IEntityRepository<Package>>();
-            var packageOwnerRequestService = new Mock<IPackageOwnerRequestService>();
+            var packageOwnerRequestRepo = new Mock<IEntityRepository<PackageOwnerRequest>>();
             var indexingService = new Mock<IIndexingService>();
             var packageNamingConflictValidator = new PackageNamingConflictValidator(
                     packageRegistrationRepository.Object,
@@ -276,7 +276,7 @@ private static Mock<PackageService> SetupPackageService(Package package)
             var packageService = new Mock<PackageService>(
                 packageRegistrationRepository.Object,
                 packageRepository.Object,
-                packageOwnerRequestService.Object,
+                packageOwnerRequestRepo.Object,
                 indexingService.Object,
                 packageNamingConflictValidator,
                 auditingService);
diff --git a/tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs b/tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs
index 6545e22234..ee2801d326 100644
--- a/tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs
+++ b/tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs
@@ -268,7 +268,7 @@ private Mock<PackageService> SetupPackageService()
                 .Verifiable();
 
             var packageRepository = new Mock<IEntityRepository<Package>>();
-            var packageOwnerRequestService = new Mock<IPackageOwnerRequestService>();
+            var packageOwnerRequestRepo = new Mock<IEntityRepository<PackageOwnerRequest>>();
             var indexingService = new Mock<IIndexingService>();
             var packageNamingConflictValidator = new PackageNamingConflictValidator(
                     packageRegistrationRepository.Object,
@@ -278,7 +278,7 @@ private Mock<PackageService> SetupPackageService()
             var packageService = new Mock<PackageService>(
                 packageRegistrationRepository.Object,
                 packageRepository.Object,
-                packageOwnerRequestService.Object,
+                packageOwnerRequestRepo.Object,
                 indexingService.Object,
                 packageNamingConflictValidator,
                 auditingService);