It looks like I fubared the rebase for this file since the majority of these changes are from #4844 which is already in master. I'll look into it and see if I can fix it.