This reverts commit fac682df7e. Again, this patch broke maintainer workflows, it needs even more care.
fac682df7e