This should make it easier to test, and would also allow other repositories to create an instance of it in a maintenance script of their own. Change-Id: I6a28e184f80eb38b5c25a0be5a9041f0c587c852