Alternatively, maybe you can ACK this PR is everything else is correct and make the changes yourself because I am not really sure how these changes should be made or why.