I wish these two forks could be merged back into one, but I don’t have any ideas for how to make it actually happen.