I also don't think this should be a roadblock for this PR being merged.