Reverting HV-844, because it causes problems with the replease plugin