workflows: revert some previous fixes