I'm confused, this part I thought I took these directly from master. I'm confused about the diff here.