We can fire a follow up bug to solve this.