Outdated diff. My other PR has this macro'd