Let's move this over to #2706