diff --git a/FedoraUpdateRestart.pm b/FedoraUpdateRestart.pm
index 8143d5e..710ef84 100644
--- a/FedoraUpdateRestart.pm
+++ b/FedoraUpdateRestart.pm
@@ -29,8 +29,7 @@ sub register {
 }
 
 # when a job completes, if it's an update test, it failed, and it's
-# not already a clone, restart it. Also restart all incomplete jobs
-# that aren't clones, as a hack for https://progress.opensuse.org/issues/62417 .
+# not already a clone, restart it.
 # Also restart all aarch64 install jobs that fail in the first test
 # module, due to https://bugzilla.redhat.com/show_bug.cgi?id=1689037,
 # which seems very common on aarch64
@@ -51,7 +50,6 @@ sub on_job_done {
             $job->result eq OpenQA::Schema::Result::Jobs::FAILED && !$clone_of &&
             $job->FLAVOR =~ /^updates-/
     );
-    $restart = "incomplete" if ($job->result eq OpenQA::Schema::Result::Jobs::INCOMPLETE && !$clone_of);
     $restart = "aarch64 install" if (
             $job->result eq OpenQA::Schema::Result::Jobs::FAILED && !$clone_of &&
             $job->TEST =~/^install_/ &&
diff --git a/openqa.spec b/openqa.spec
index a6d73ad..836d638 100644
--- a/openqa.spec
+++ b/openqa.spec
@@ -23,13 +23,13 @@
 %global github_owner    os-autoinst
 %global github_name     openQA
 %global github_version  4.6
-%global github_commit   4861e34893826b6da4f5bdcaecad1cb66fc4e5cc
+%global github_commit   12cea51da8e77ae1553de81741392e299cae4005
 # if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date     20200205
+%global github_date     20200319
 %global shortcommit     %(c=%{github_commit}; echo ${c:0:7})
 
 # can't use linebreaks here!
-%global openqa_services openqa-webui.service openqa-gru.service openqa-websockets.service openqa-scheduler.service openqa-enqueue-audit-event-cleanup.service openqa-enqueue-audit-event-cleanup.timer openqa-enqueue-asset-cleanup.service openqa-enqueue-asset-cleanup.timer openqa-enqueue-result-cleanup.service openqa-enqueue-result-cleanup.timer
+%global openqa_services openqa-webui.service openqa-gru.service openqa-websockets.service openqa-scheduler.service openqa-enqueue-audit-event-cleanup.service openqa-enqueue-audit-event-cleanup.timer openqa-enqueue-asset-cleanup.service openqa-enqueue-asset-cleanup.timer openqa-enqueue-result-cleanup.service openqa-enqueue-result-cleanup.timer openqa-enqueue-bug-cleanup.service openqa-enqueue-bug-cleanup.timer
 %global openqa_worker_services openqa-worker.target openqa-slirpvde.service openqa-vde_switch.service openqa-worker-cacheservice.service openqa-worker-cacheservice-minion.service
 
 %if %{undefined tmpfiles_create}
@@ -40,11 +40,11 @@
 
 %define python_scripts_requires python3-requests python3-future
 %define assetpack_requires perl(Mojolicious::Plugin::AssetPack) >= 2.01, perl(CSS::Minifier::XS) perl(JavaScript::Minifier::XS)
-%define common_requires perl(Config::IniFiles) perl(Cpanel::JSON::XS) perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Getopt::Long) perl(Minion) >= 9.09, perl(Mojolicious) >= 8.24, perl(Try::Tiny) perl(Regexp::Common), perl(Storable)
+%define common_requires perl(Archive::Extract) perl(Config::IniFiles) perl(Cpanel::JSON::XS) perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Getopt::Long) perl(Minion) >= 9.09, perl(Mojolicious) >= 8.24, perl(Try::Tiny) perl(Regexp::Common), perl(Storable)
 # runtime requirements for the main package that are not required by other sub-packages
 # diff from suse: we need perl(Time::Seconds) and perl(Time::Piece)
 # here, do not lose them when copying from suse
-%define main_requires %assetpack_requires git-core perl(Carp::Always) perl(Date::Format) perl(DateTime::Format::Pg) perl(DBD::Pg) >= 3.7.4, perl(DBI) >= 1.632, perl(DBIx::Class) >= 0.082801, perl(DBIx::Class::DeploymentHandler) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(DBIx::Class::OptimisticLocking) perl(File::Copy::Recursive) perl(Net::OpenID::Consumer) perl(Module::Pluggable) perl(aliased) perl(Config::Tiny) perl(Text::Diff) perl(CommonMark) perl(JSON::Validator) perl(IPC::Run) perl(Archive::Extract) perl(Time::ParseDate) perl(Sort::Versions) perl(BSD::Resource) perl(Pod::POM) perl(Mojo::Pg) perl(Mojo::RabbitMQ::Client) >= 0.2, perl(SQL::Translator) perl(YAML::XS) >= 0.67, perl(LWP::UserAgent) perl(Getopt::Long::Descriptive) perl(Time::Seconds) perl(Time::Piece)
+%define main_requires %assetpack_requires git-core perl(Carp::Always) perl(Date::Format) perl(DateTime::Format::Pg) perl(DBD::Pg) >= 3.7.4, perl(DBI) >= 1.632, perl(DBIx::Class) >= 0.082801, perl(DBIx::Class::DeploymentHandler) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(DBIx::Class::OptimisticLocking) perl(File::Copy::Recursive) perl(Net::OpenID::Consumer) perl(Module::Pluggable) perl(aliased) perl(Config::Tiny) perl(Text::Diff) perl(CommonMark) perl(JSON::Validator) perl(IPC::Run) perl(Time::ParseDate) perl(Sort::Versions) perl(BSD::Resource) perl(Pod::POM) perl(Mojo::Pg) perl(Mojo::RabbitMQ::Client) >= 0.2, perl(SQL::Translator) perl(YAML::PP) perl(YAML::XS) >= 0.67, perl(LWP::UserAgent) perl(Getopt::Long::Descriptive) perl(Time::Seconds) perl(Time::Piece)
 %define client_requires curl jq git-core perl(IO::Socket::SSL) >= 2.009, perl(LWP::UserAgent) perl(LWP::Protocol::https) perl(IPC::Run)
 %define worker_requires os-autoinst < 5, perl(Mojo::IOLoop::ReadWriteProcess) > 0.19, perl(Minion::Backend::SQLite) perl(Mojo::SQLite) openqa-client optipng
 %define build_requires rubygem(sass) %assetpack_requires
@@ -66,7 +66,7 @@
 
 Name:           openqa
 Version:        %{github_version}
-Release:        44%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release:        45%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
 Summary:        OS-level automated testing framework
 License:        GPLv2+
 Url:            http://os-autoinst.github.io/openQA/
@@ -306,6 +306,7 @@ ln -s %{_datadir}/openqa/script/dump_templates %{buildroot}%{_bindir}/openqa-dum
 ln -s %{_datadir}/openqa/script/load_templates %{buildroot}%{_bindir}/openqa-load-templates
 ln -s %{_datadir}/openqa/script/openqa-clone-custom-git-refspec %{buildroot}%{_bindir}/openqa-clone-custom-git-refspec
 ln -s %{_datadir}/openqa/script/openqa-validate-yaml %{buildroot}%{_bindir}/openqa-validate-yaml
+ln -s %{_datadir}/openqa/script/setup-db %{buildroot}%{_bindir}/openqa-setup-db
 ln -s %{_datadir}/openqa/script/openqa-label-all %{buildroot}%{_bindir}/openqa-label-all
 
 
@@ -332,7 +333,7 @@ export LC_ALL=en_US.UTF-8
 touch openqa-debug.log autoinst-log.txt
 chmod a+w openqa-debug.log autoinst-log.txt
 # we can't use 'unshare' in Fedora package build env
-sed -i -e 's,unshare -r -n ,,g' t/40-script_openqa-clone-custom-git-refspec.t
+sed -i -e 's,unshare -r -n ,,g' t/40-script_openqa-clone-custom-git-refspec.t t/40-openqa-clone-job.t
 # Skip tests not working currently, or flaky
 rm t/25-cache-service.t t/17-labels_carry_over.t
 
@@ -415,6 +416,8 @@ fi
 %{_unitdir}/openqa-enqueue-asset-cleanup.timer
 %{_unitdir}/openqa-enqueue-result-cleanup.service
 %{_unitdir}/openqa-enqueue-result-cleanup.timer
+%{_unitdir}/openqa-enqueue-bug-cleanup.service
+%{_unitdir}/openqa-enqueue-bug-cleanup.timer
 %{_tmpfilesdir}/openqa-webui.conf
 # web libs
 %{_datadir}/openqa/templates
@@ -532,6 +535,8 @@ fi
 
 %files local-db
 %{_unitdir}/openqa-setup-db.service
+%{_datadir}/openqa/script/setup-db
+%{_bindir}/openqa-setup-db
 
 %files bootstrap
 %{_datadir}/openqa/script/openqa-bootstrap
@@ -544,6 +549,10 @@ fi
 %{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm
 
 %changelog
+* Thu Mar 19 2020 Adam Williamson <awilliam@redhat.com> - 4.6-45.20200319git12cea51
+- Bump to latest git (inc. fix for POO #62417)
+- Drop workaround for POO #62417
+
 * Thu Mar 19 2020 Adam Williamson <awilliam@redhat.com> - 4.6-44.20200205git4861e34
 - Restart aarch64 install tests that fail in the first module (#1689037)