Correct, we cannot make the commit exactly the same due to the binding stuff. This change just makes the code bases as similar as possible.