Actually make this PR mergeable