Unify the two branches. I don't know why they're different :(