Again, move this around to minimize diff.