This is of interested (especially the ignoring of `was_upgrade`)