Indeed, please test this so we can potentially clean this up in this patch.