Let's move this entire section to ConnectionFileMixin.