I realized this commit isn't yet on crates.io. I think this is the last thing I need to stop using my own fork.