This reverts commit ec0bb42b45. This patch broke maintainer workflows, it needs more work before it can land.
ec0bb42b45