Rebased removal workflow pull request

Supersedes #3826. See that pull for discussion.