WIP: attempt to resolve organizer rollback issues